diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-17 16:16:16 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-17 16:25:33 +0200 |
| commit | ddb5093001a1c98921f941cf74712fba12ff0cc5 (patch) | |
| tree | f385f4150f357b71500e503568b8eecc3e6c0302 /vespa-athenz | |
| parent | b65667463f7add415a7b1240da7a22ae384b1942 (diff) | |
Rename getCommonNames -> getSubjectCommonNames
Diffstat (limited to 'vespa-athenz')
3 files changed, 2 insertions, 3 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateUtils.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateUtils.java index 707666ae3c8..e66373b6a03 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateUtils.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/X509CertificateUtils.java @@ -68,7 +68,7 @@ public class X509CertificateUtils { } } - public static List<String> getCommonNames(X509Certificate certificate) { + public static List<String> getSubjectCommonNames(X509Certificate certificate) { return getCommonNames(certificate.getSubjectX500Principal()); } diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java index ad2428cc292..82aecc62306 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/utils/AthenzIdentities.java @@ -53,7 +53,7 @@ public class AthenzIdentities { } private static String getCommonName(X509Certificate certificate) { - List<String> commonNames = X509CertificateUtils.getCommonNames(certificate); + List<String> commonNames = X509CertificateUtils.getSubjectCommonNames(certificate); if (commonNames.size() != 1) { String subjectName = certificate.getSubjectX500Principal().getName(); throw new IllegalArgumentException("Expected single CN in certificate's subject: " + subjectName); diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/X509CertificateUtilsTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/X509CertificateUtilsTest.java index cc203011c0b..718c0e88972 100644 --- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/X509CertificateUtilsTest.java +++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/tls/X509CertificateUtilsTest.java @@ -1,6 +1,5 @@ package com.yahoo.vespa.athenz.tls; -import org.hamcrest.Matchers; import org.junit.Test; import javax.security.auth.x500.X500Principal; |