diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-10-12 13:57:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-12 13:57:01 +0200 |
| commit | f329a9d5e0a323b0485dcae52d90987b675808bc (patch) | |
| tree | 747730a4747035d492d2fb3f0c0212a20c20affb /security-utils | |
| parent | 25b6afc7d402dbf4400377e47750d4053d0af481 (diff) | |
| parent | 1d25e7c4c9ecbb2cdee83113c515276cf68d7c1a (diff) | |
Merge pull request #24403 from vespa-engine/bjorncs/upgrade-bc
Upgrade BouncyCastle to 1.72 [run-systemtest]
Diffstat (limited to 'security-utils')
| -rw-r--r-- | security-utils/pom.xml | 2 | ||||
| -rw-r--r-- | security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security-utils/pom.xml b/security-utils/pom.xml index 71920327fbb..a6f0040509c 100644 --- a/security-utils/pom.xml +++ b/security-utils/pom.xml @@ -24,7 +24,7 @@ <!-- compile scope --> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> + <artifactId>bcpkix-jdk18on</artifactId> <scope>compile</scope> </dependency> <dependency> diff --git a/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java b/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java index c01de58987c..e184d982790 100644 --- a/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java +++ b/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java @@ -2,7 +2,7 @@ package com.yahoo.security; import org.bouncycastle.asn1.ASN1Encodable; -import org.bouncycastle.asn1.DERIA5String; +import org.bouncycastle.asn1.ASN1IA5String; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x509.GeneralName; @@ -60,7 +60,7 @@ public class SubjectAlternativeName { case GeneralName.rfc822Name: case GeneralName.dNSName: case GeneralName.uniformResourceIdentifier: - return DERIA5String.getInstance(name).getString(); + return ASN1IA5String.getInstance(name).getString(); case GeneralName.directoryName: return X500Name.getInstance(name).toString(); case GeneralName.iPAddress: |