CORDA-3979: Support for multiple trust roots (#6772)

This commit is contained in:
Denis Rekalov
2020-10-20 12:18:00 +03:00
committed by GitHub
parent 401d8b8856
commit 4193adf6fd
37 changed files with 486 additions and 131 deletions

View File

@ -358,7 +358,7 @@ class X509UtilitiesTest {
val peerChain = clientSocket.session.peerCertificates.x509
val peerX500Principal = peerChain[0].subjectX500Principal
assertEquals(MEGA_CORP.name.x500Principal, peerX500Principal)
X509Utilities.validateCertificateChain(rootCa.certificate, peerChain)
X509Utilities.validateCertificateChain(setOf(rootCa.certificate), peerChain)
val output = DataOutputStream(clientSocket.outputStream)
output.writeUTF("Hello World")
var timeout = 0
@ -432,7 +432,7 @@ class X509UtilitiesTest {
val peerChain = client.engine!!.session.peerCertificates.x509
val peerX500Principal = peerChain[0].subjectX500Principal
assertEquals(MEGA_CORP.name.x500Principal, peerX500Principal)
X509Utilities.validateCertificateChain(rootCa.certificate, peerChain)
X509Utilities.validateCertificateChain(setOf(rootCa.certificate), peerChain)
}
}
}

View File

@ -372,7 +372,7 @@ class NetworkBootstrapperTest {
private val Path.networkParameters: NetworkParameters
get() {
return (this / NETWORK_PARAMS_FILE_NAME).readObject<SignedNetworkParameters>()
.verifiedNetworkParametersCert(DEV_ROOT_CA.certificate)
.verifiedNetworkParametersCert(setOf(DEV_ROOT_CA.certificate))
}
private val Path.nodeInfoFile: Path