ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-29 15:43:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

core: Remove CN from X509 subjectAlternativeNames, always add hostname

Browse Source
This commit is contained in:
Andras Slemmer 2016-12-05 13:17:52 +00:00
parent 9fdbf4e888
commit 948e3f3932
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/kotlin/net/corda/core/crypto/X509Utilities.kt
View File

@ -380,7 +380,6 @@ object X509Utilities {
DERSequence(purposes))
val subjectAlternativeNames = ArrayList<ASN1Encodable>()
subjectAlternativeNames.add(GeneralName(GeneralName.dNSName, subject.getRDNs(BCStyle.CN).first().first.value))
for (subjectAlternativeNameDomain in subjectAlternativeNameDomains) {
subjectAlternativeNames.add(GeneralName(GeneralName.dNSName, subjectAlternativeNameDomain))
@ -591,7 +590,7 @@ object X509Utilities {
getDevX509Name(commonName),
serverKey.public,
intermediateCA,
if (host.canonicalHostName == host.hostName) listOf() else listOf(host.hostName),
listOf(host.hostName),
listOf(host.hostAddress))
val keyPass = keyPassword.toCharArray()

10
core/src/test/kotlin/net/corda/core/crypto/X509UtilitiesTest.kt
View File

@ -61,23 +61,17 @@ class X509UtilitiesTest {
serverCert.verify(caCertAndKey.keyPair.public) // throws on verification problems
assertFalse { serverCert.keyUsage[5] } // Bit 5 == keyCertSign according to ASN.1 spec (see full comment on KeyUsage property)
assertTrue { serverCert.basicConstraints === -1 } // This returns the signing path length should be -1 for non-CA certificate
assertEquals(3, serverCert.subjectAlternativeNames.size)
var foundMainDnsName = false
assertEquals(2, serverCert.subjectAlternativeNames.size)
var foundAliasDnsName = false
for (entry in serverCert.subjectAlternativeNames) {
val typeId = entry[0] as Int
val value = entry[1] as String
if (typeId == GeneralName.iPAddress) {
assertEquals("10.0.0.54", value)
} else if (typeId == GeneralName.dNSName) {
if (value == "Server Cert") {
foundMainDnsName = true
} else if (value == "alias name") {
} else if (value == "alias name") {
foundAliasDnsName = true
}
}
}
assertTrue(foundMainDnsName)
assertTrue(foundAliasDnsName)
}