ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-02 07:30:53 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Correct usage of hostName and cannonicalHostName in certificates to ensure the SSL certificates validate on Linux

Browse Source
This commit is contained in:
Matthew Nesbit 2016-07-22 14:23:17 +01:00
parent 00f897d58d
commit c7bc5ae652
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/kotlin/com/r3corda/core/crypto/X509Utilities.kt
View File

@ -522,7 +522,7 @@ object X509Utilities {
val serverCert = X509Utilities.createServerCert(subject, val serverCert = X509Utilities.createServerCert(subject,
serverKey.public, serverKey.public,
intermediateCA, intermediateCA,
listOf(), if(host.canonicalHostName == host.hostName) listOf() else listOf(host.hostName),
listOf(host.hostAddress)) listOf(host.hostAddress))
val keypass = keyPassword.toCharArray() val keypass = keyPassword.toCharArray()

4
core/src/test/kotlin/com/r3corda/core/crypto/X509UtilitiesTest.kt
View File

@ -162,7 +162,7 @@ class X509UtilitiesTest {
serverCertAndKey.certificate.verify(caCertAndKey.certificate.publicKey) serverCertAndKey.certificate.verify(caCertAndKey.certificate.publicKey)
val host = InetAddress.getLocalHost() val host = InetAddress.getLocalHost()
assertTrue { serverCertAndKey.certificate.subjectDN.name.contains("CN=" + host.hostName) } assertTrue { serverCertAndKey.certificate.subjectDN.name.contains("CN=" + host.canonicalHostName) }
// Now sign something with private key and verify against certificate public key // Now sign something with private key and verify against certificate public key
val testData = "123456".toByteArray() val testData = "123456".toByteArray()
@ -261,7 +261,7 @@ class X509UtilitiesTest {
val peerX500Principal = (peerChain[0] as X509Certificate).subjectX500Principal val peerX500Principal = (peerChain[0] as X509Certificate).subjectX500Principal
val x500name = X500Name(peerX500Principal.name) val x500name = X500Name(peerX500Principal.name)
val cn = x500name.getRDNs(BCStyle.CN).first().first.value.toString() val cn = x500name.getRDNs(BCStyle.CN).first().first.value.toString()
val hostname = InetAddress.getLocalHost().hostName val hostname = InetAddress.getLocalHost().canonicalHostName
assertEquals(hostname, cn) assertEquals(hostname, cn)