summaryrefslogtreecommitdiffstats
path: root/athenz-identity-provider-service
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2017-11-10 13:26:16 +0100
committerValerij Fredriksen <valerijf@oath.com>2017-11-10 13:26:16 +0100
commit0a77a592073d219fe8dbabf527a95cd9b46b477e (patch)
tree60f8ae7b1cbdb3cdcceb68af64bcdc7b6e47e412 /athenz-identity-provider-service
parent8a6bb95ec100f05134ff872ec3ffd2188f2ac502 (diff)
CERTIFICATE_DURATION -> CERTIFICATE_EXPIRATION
Diffstat (limited to 'athenz-identity-provider-service')
-rw-r--r--athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSigner.java4
-rw-r--r--athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSignerTest.java2
2 files changed, 3 insertions, 3 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 4f192e7551a..3cb530b9088 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
@@ -50,7 +50,7 @@ public class CertificateSigner {
private static final Logger log = Logger.getLogger(CertificateSigner.class.getName());
static final String SIGNER_ALGORITHM = "SHA256withRSA";
- static final Duration CERTIIFICATE_DURATION = Duration.ofDays(30);
+ static final Duration CERTIFICATE_EXPIRATION = Duration.ofDays(30);
private static final List<ASN1ObjectIdentifier> ILLEGAL_EXTENSIONS = ImmutableList.of(
Extension.basicConstraints, Extension.subjectAlternativeName);
@@ -82,7 +82,7 @@ public class CertificateSigner {
assertCertificateExtensions(certReq);
Date notBefore = Date.from(clock.instant());
- Date notAfter = Date.from(clock.instant().plus(CERTIIFICATE_DURATION));
+ Date notAfter = Date.from(clock.instant().plus(CERTIFICATE_EXPIRATION));
try {
PublicKey publicKey = new JcaPKCS10CertificationRequest(certReq).getPublicKey();
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSignerTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSignerTest.java
index 461d8e004d6..cf110608e68 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSignerTest.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ca/CertificateSignerTest.java
@@ -101,7 +101,7 @@ public class CertificateSignerTest {
assertEquals(3, certificate.getVersion());
assertEquals(BigInteger.valueOf(startTime), certificate.getSerialNumber());
assertEquals(startTime, certificate.getNotBefore().getTime());
- assertEquals(startTime + CertificateSigner.CERTIIFICATE_DURATION.toMillis(), certificate.getNotAfter().getTime());
+ assertEquals(startTime + CertificateSigner.CERTIFICATE_EXPIRATION.toMillis(), certificate.getNotAfter().getTime());
assertEquals(CertificateSigner.SIGNER_ALGORITHM, certificate.getSigAlgName());
assertEquals(expectedSubjectName, certificate.getSubjectDN().getName());
assertEquals("CN=" + cfgServerHostname, certificate.getIssuerX500Principal().getName());