summaryrefslogtreecommitdiffstats
path: root/athenz-identity-provider-service/src/main
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2017-11-10 13:37:06 +0100
committerValerij Fredriksen <valerijf@oath.com>2017-11-10 13:37:06 +0100
commit551d3a57948bf0b3cac5b3c14c769d0b23f26370 (patch)
tree317a2f8cdcc685b97a9db424bdd402476991aa3e /athenz-identity-provider-service/src/main
parent93d94fff227927c306bd0432fca50be46addd945 (diff)
assert* -> verify*
Diffstat (limited to 'athenz-identity-provider-service/src/main')
-rw-r--r--athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java
index 0806ac6225b..2e00695f2f0 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java
@@ -82,8 +82,8 @@ public class CertificateSigner {
* </ul>
*/
X509Certificate generateX509Certificate(PKCS10CertificationRequest certReq, String remoteHostname) {
- assertCertificateCommonName(certReq.getSubject(), remoteHostname);
- assertCertificateExtensions(certReq);
+ verifyCertificateCommonName(certReq.getSubject(), remoteHostname);
+ verifyCertificateExtensions(certReq);
Date notBefore = Date.from(clock.instant());
Date notAfter = Date.from(clock.instant().plus(CERTIFICATE_EXPIRATION));
@@ -107,7 +107,7 @@ public class CertificateSigner {
}
}
- static void assertCertificateCommonName(X500Name subject, String commonName) {
+ static void verifyCertificateCommonName(X500Name subject, String commonName) {
List<AttributeTypeAndValue> attributesAndValues = Arrays.stream(subject.getRDNs())
.flatMap(rdn -> rdn.isMultiValued() ?
Stream.of(rdn.getTypesAndValues()) : Stream.of(rdn.getFirst()))
@@ -125,7 +125,7 @@ public class CertificateSigner {
}
@SuppressWarnings("unchecked")
- static void assertCertificateExtensions(PKCS10CertificationRequest request) {
+ static void verifyCertificateExtensions(PKCS10CertificationRequest request) {
List<String> illegalExt = Arrays
.stream(request.getAttributes(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest))
.map(attribute -> Extensions.getInstance(attribute.getAttrValues().getObjectAt(0)))