Keep more consistency with RFC (timeOfRevocation -> revocationTime)

Author: Nirusu

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/certificate/ocsp/CertificateStatus.java

@@ -27,7 +27,7 @@ public class CertificateStatus {
     private byte[] issuerKeyHash;
     private BigInteger serialNumber;
     private Integer certificateStatus;
-    private String timeOfRevocation;
+    private String revocationTime;
     private Integer revocationReason;
     private String timeOfLastUpdate;
     private String timeOfNextUpdate;
@@ -80,12 +80,12 @@ public void setCertificateStatus(Integer certificateStatus) {
         this.certificateStatus = certificateStatus;
     }
 
-    public String getTimeOfRevocation() {
-        return timeOfRevocation;
+    public String getRevocationTime() {
+        return revocationTime;
     }
 
-    public void setTimeOfRevocation(String timeOfRevocation) {
-        this.timeOfRevocation = timeOfRevocation;
+    public void setRevocationTime(String revocationTime) {
+        this.revocationTime = revocationTime;
     }
 
     public String getTimeOfLastUpdate() {
@@ -131,7 +131,7 @@ public String toString() {
             sb.append("\n Certificate Status: ");
             sb.append(RevocationStatus.translate(getCertificateStatus()));
             if (getCertificateStatus().equals(RevocationStatus.translate("revoked"))) {
-                sb.append("\n Time of Revocation: ").append(formatDate(getTimeOfRevocation()));
+                sb.append("\n Revocation Time: ").append(formatDate(getRevocationTime()));
                 if (getRevocationReason() != null) {
                     sb.append("\n Revocation Reason: ");
                     sb.append(CrlReason.translate(getRevocationReason()));

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/certificate/ocsp/CertificateStatusParser.java

@@ -38,7 +38,7 @@ public static CertificateStatus parseCertificateStatus(Asn1Sequence certStatusSe
         byte[] issuerKeyHash = null;
         BigInteger serialNumber = null;
         Integer certificateStatusValue = null;
-        String timeOfRevocation = null;
+        String revocationTime = null;
         Integer revocationReason = null;
         String timeOfLastUpdate = null;
         String timeOfNextUpdate = null;
@@ -104,7 +104,7 @@ else if (certStatusObject instanceof Asn1Explicit) {
                 case 1:
                     certificateStatusValue = 1; // revoked
                     List<Asn1Encodable> revocationObjects = certStatusExplicitObject.getChildren();
-                    timeOfRevocation = ((Asn1PrimitiveGeneralizedTime) revocationObjects.get(0)).getValue();
+                    revocationTime = ((Asn1PrimitiveGeneralizedTime) revocationObjects.get(0)).getValue();
 
                     // Optional revocation reason
                     if (revocationObjects.size() > 1) {
@@ -148,7 +148,7 @@ else if (certStatusObject instanceof Asn1Explicit) {
         certificateStatus.setIssuerKeyHash(issuerKeyHash);
         certificateStatus.setSerialNumber(serialNumber);
         certificateStatus.setCertificateStatus(certificateStatusValue);
-        certificateStatus.setTimeOfRevocation(timeOfRevocation);
+        certificateStatus.setRevocationTime(revocationTime);
         certificateStatus.setRevocationReason(revocationReason);
         certificateStatus.setTimeOfLastUpdate(timeOfLastUpdate);
         certificateStatus.setTimeOfNextUpdate(timeOfNextUpdate);

TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/certificate/ocsp/OCSPResponse.java

@@ -10,9 +10,7 @@
 package de.rub.nds.tlsattacker.core.certificate.ocsp;
 
 import de.rub.nds.asn1.Asn1Encodable;
-import de.rub.nds.asn1.model.Asn1EncapsulatingBitString;
 import de.rub.nds.asn1.model.Asn1ObjectIdentifier;
-import de.rub.nds.asn1.model.Asn1PrimitiveBitString;
 import de.rub.nds.asn1.model.Asn1PrimitivePrintableString;
 import de.rub.nds.asn1.model.Asn1PrimitiveUtf8String;
 import de.rub.nds.asn1.model.Asn1Sequence;
@@ -27,7 +25,6 @@
 import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -224,7 +221,7 @@ public String toString(boolean includeSignatureAndCertificate) {
             sb.append("\n   Certificate Status: ");
             sb.append(RevocationStatus.translate(certificateStatus.getCertificateStatus()));
             if (certificateStatus.getCertificateStatus().equals(RevocationStatus.translate("revoked"))) {
-                sb.append("\n    Time of Revocation: ").append(formatDate(certificateStatus.getTimeOfRevocation()));
+                sb.append("\n    Revocation Time: ").append(formatDate(certificateStatus.getRevocationTime()));
                 if (certificateStatus.getRevocationReason() != null) {
                     sb.append("\n    Revocation Reason: ");
                     sb.append(CrlReason.translate(certificateStatus.getRevocationReason()));

TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/certificate/ocsp/CertificateStatusParserTest.java

@@ -78,15 +78,15 @@ public void testParseCertificateStatus() {
     public void testParseCertificateStatusGood() {
         // Certificate has "good" status
         Assert.assertEquals(new Integer(0), certificateStatusGood.getCertificateStatus());
-        Assert.assertNull(certificateStatusGood.getTimeOfRevocation());
+        Assert.assertNull(certificateStatusGood.getRevocationTime());
         Assert.assertNull(certificateStatusGood.getRevocationReason());
     }
 
     @Test
     public void testParseCertificateStatusRevoked() {
         // Certificate has "revoked" status, but no reason
         Assert.assertEquals(new Integer(1), certificateStatusRevoked.getCertificateStatus());
-        Assert.assertEquals("20200423141917Z", certificateStatusRevoked.getTimeOfRevocation());
+        Assert.assertEquals("20200423141917Z", certificateStatusRevoked.getRevocationTime());
         Assert.assertNull(certificateStatusRevoked.getRevocationReason());
     }
 }