Refactoring in asn1.tsp

peterdettman · peterdettman · commit 1375abc6ad18 · 2023-07-18T17:32:17.000+07:00
diff --git a/util/src/main/java/org/bouncycastle/asn1/tsp/ArchiveTimeStampChain.java b/util/src/main/java/org/bouncycastle/asn1/tsp/ArchiveTimeStampChain.java
@@ -19,7 +19,7 @@
 public class ArchiveTimeStampChain
     extends ASN1Object
 {
-    private ASN1Sequence archiveTimestamps;
+    private ASN1Sequence archiveTimeStamps;
 
     /**
      * Return an ArchiveTimeStampChain from the given object.
@@ -44,12 +44,12 @@ else if (obj != null)
 
     public ArchiveTimeStampChain(ArchiveTimeStamp archiveTimeStamp)
     {
-        archiveTimestamps = new DERSequence(archiveTimeStamp);
+        this.archiveTimeStamps = new DERSequence(archiveTimeStamp);
     }
 
     public ArchiveTimeStampChain(ArchiveTimeStamp[] archiveTimeStamps)
     {
-        archiveTimestamps = new DERSequence(archiveTimeStamps);
+        this.archiveTimeStamps = new DERSequence(archiveTimeStamps);
     }
 
     private ArchiveTimeStampChain(final ASN1Sequence sequence)
@@ -62,16 +62,16 @@ private ArchiveTimeStampChain(final ASN1Sequence sequence)
             vector.add(ArchiveTimeStamp.getInstance(objects.nextElement()));
         }
 
-        archiveTimestamps = new DERSequence(vector);
+        this.archiveTimeStamps = new DERSequence(vector);
     }
 
     public ArchiveTimeStamp[] getArchiveTimestamps()
     {
-        ArchiveTimeStamp[] rv = new ArchiveTimeStamp[archiveTimestamps.size()];
+        ArchiveTimeStamp[] rv = new ArchiveTimeStamp[archiveTimeStamps.size()];
 
         for (int i = 0; i != rv.length; i++)
         {
-            rv[i] = ArchiveTimeStamp.getInstance(archiveTimestamps.getObjectAt(i));
+            rv[i] = ArchiveTimeStamp.getInstance(archiveTimeStamps.getObjectAt(i));
         }
 
         return rv;
@@ -85,11 +85,11 @@ public ArchiveTimeStamp[] getArchiveTimestamps()
      */
     public ArchiveTimeStampChain append(final ArchiveTimeStamp archiveTimeStamp)
     {
-        ASN1EncodableVector v = new ASN1EncodableVector(archiveTimestamps.size() + 1);
+        ASN1EncodableVector v = new ASN1EncodableVector(archiveTimeStamps.size() + 1);
 
-        for (int i = 0; i != archiveTimestamps.size(); i++)
+        for (int i = 0; i != archiveTimeStamps.size(); i++)
         {
-            v.add(archiveTimestamps.getObjectAt(i));
+            v.add(archiveTimeStamps.getObjectAt(i));
         }
 
         v.add(archiveTimeStamp);
@@ -99,6 +99,6 @@ public ArchiveTimeStampChain append(final ArchiveTimeStamp archiveTimeStamp)
 
     public ASN1Primitive toASN1Primitive()
     {
-        return archiveTimestamps;
+        return archiveTimeStamps;
     }
 }
diff --git a/util/src/main/java/org/bouncycastle/asn1/tsp/ArchiveTimeStampSequence.java b/util/src/main/java/org/bouncycastle/asn1/tsp/ArchiveTimeStampSequence.java
@@ -30,7 +30,7 @@ public class ArchiveTimeStampSequence
      */
     public static ArchiveTimeStampSequence getInstance(final Object obj)
     {
-        if (obj instanceof ArchiveTimeStampChain)
+        if (obj instanceof ArchiveTimeStampSequence)
         {
             return (ArchiveTimeStampSequence)obj;
         }
@@ -43,7 +43,6 @@ else if (obj != null)
     }
 
     private ArchiveTimeStampSequence(final ASN1Sequence sequence)
-        throws IllegalArgumentException
     {
         final ASN1EncodableVector vector = new ASN1EncodableVector(sequence.size());
 
diff --git a/util/src/main/java/org/bouncycastle/asn1/tsp/EncryptionInfo.java b/util/src/main/java/org/bouncycastle/asn1/tsp/EncryptionInfo.java
@@ -46,7 +46,15 @@ public class EncryptionInfo
      */
     private ASN1Encodable encryptionInfoValue;
 
+    /**
+     * @deprecated Use {@link EncryptionInfo#getInstance(Object)} instead.
+     */
     public static EncryptionInfo getInstance(final ASN1Object obj)
+    {
+        return getInstance((Object)obj);
+    }
+
+    public static EncryptionInfo getInstance(final Object obj)
     {
         if (obj instanceof EncryptionInfo)
         {
@@ -64,7 +72,7 @@ public static EncryptionInfo getInstance(
         ASN1TaggedObject obj,
         boolean explicit)
     {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
+        return getInstance((Object)ASN1Sequence.getInstance(obj, explicit));
     }
 
     private EncryptionInfo(ASN1Sequence sequence)
@@ -85,6 +93,16 @@ public EncryptionInfo(ASN1ObjectIdentifier encryptionInfoType,
         this.encryptionInfoValue = encryptionInfoValue;
     }
 
+    public ASN1ObjectIdentifier getEncryptionInfoType()
+    {
+        return encryptionInfoType;
+    }
+
+    public ASN1Encodable getEncryptionInfoValue()
+    {
+        return encryptionInfoValue;
+    }
+
     public ASN1Primitive toASN1Primitive()
     {
         ASN1EncodableVector v = new ASN1EncodableVector(2);
diff --git a/util/src/main/java/org/bouncycastle/asn1/tsp/PartialHashtree.java b/util/src/main/java/org/bouncycastle/asn1/tsp/PartialHashtree.java
@@ -51,7 +51,7 @@ private PartialHashtree(final ASN1Sequence values)
     {
         for (int i = 0; i != values.size(); i++)
         {
-            if (!(values.getObjectAt(i) instanceof DEROctetString))
+            if (!(values.getObjectAt(i) instanceof ASN1OctetString))
             {
                 throw new IllegalArgumentException("unknown object in constructor: " + values
                     .getObjectAt(i).getClass().getName());

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`public class ArchiveTimeStampChain`
`20`	`20`	`extends ASN1Object`
`21`	`21`	`{`
`22`		`- private ASN1Sequence archiveTimestamps;`
	`22`	`+ private ASN1Sequence archiveTimeStamps;`
`23`	`23`
`24`	`24`	`/**`
`25`	`25`	`* Return an ArchiveTimeStampChain from the given object.`
`@@ -44,12 +44,12 @@ else if (obj != null)`
`44`	`44`
`45`	`45`	`public ArchiveTimeStampChain(ArchiveTimeStamp archiveTimeStamp)`
`46`	`46`	`{`
`47`		`- archiveTimestamps = new DERSequence(archiveTimeStamp);`
	`47`	`+ this.archiveTimeStamps = new DERSequence(archiveTimeStamp);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public ArchiveTimeStampChain(ArchiveTimeStamp[] archiveTimeStamps)`
`51`	`51`	`{`
`52`		`- archiveTimestamps = new DERSequence(archiveTimeStamps);`
	`52`	`+ this.archiveTimeStamps = new DERSequence(archiveTimeStamps);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`private ArchiveTimeStampChain(final ASN1Sequence sequence)`
`@@ -62,16 +62,16 @@ private ArchiveTimeStampChain(final ASN1Sequence sequence)`
`62`	`62`	`vector.add(ArchiveTimeStamp.getInstance(objects.nextElement()));`
`63`	`63`	`}`
`64`	`64`
`65`		`- archiveTimestamps = new DERSequence(vector);`
	`65`	`+ this.archiveTimeStamps = new DERSequence(vector);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public ArchiveTimeStamp[] getArchiveTimestamps()`
`69`	`69`	`{`
`70`		`- ArchiveTimeStamp[] rv = new ArchiveTimeStamp[archiveTimestamps.size()];`
	`70`	`+ ArchiveTimeStamp[] rv = new ArchiveTimeStamp[archiveTimeStamps.size()];`
`71`	`71`
`72`	`72`	`for (int i = 0; i != rv.length; i++)`
`73`	`73`	`{`
`74`		`- rv[i] = ArchiveTimeStamp.getInstance(archiveTimestamps.getObjectAt(i));`
	`74`	`+ rv[i] = ArchiveTimeStamp.getInstance(archiveTimeStamps.getObjectAt(i));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`return rv;`
`@@ -85,11 +85,11 @@ public ArchiveTimeStamp[] getArchiveTimestamps()`
`85`	`85`	`*/`
`86`	`86`	`public ArchiveTimeStampChain append(final ArchiveTimeStamp archiveTimeStamp)`
`87`	`87`	`{`
`88`		`- ASN1EncodableVector v = new ASN1EncodableVector(archiveTimestamps.size() + 1);`
	`88`	`+ ASN1EncodableVector v = new ASN1EncodableVector(archiveTimeStamps.size() + 1);`
`89`	`89`
`90`		`- for (int i = 0; i != archiveTimestamps.size(); i++)`
	`90`	`+ for (int i = 0; i != archiveTimeStamps.size(); i++)`
`91`	`91`	`{`
`92`		`- v.add(archiveTimestamps.getObjectAt(i));`
	`92`	`+ v.add(archiveTimeStamps.getObjectAt(i));`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`v.add(archiveTimeStamp);`
`@@ -99,6 +99,6 @@ public ArchiveTimeStampChain append(final ArchiveTimeStamp archiveTimeStamp)`
`99`	`99`
`100`	`100`	`public ASN1Primitive toASN1Primitive()`
`101`	`101`	`{`
`102`		`- return archiveTimestamps;`
	`102`	`+ return archiveTimeStamps;`
`103`	`103`	`}`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class ArchiveTimeStampSequence`
`30`	`30`	`*/`
`31`	`31`	`public static ArchiveTimeStampSequence getInstance(final Object obj)`
`32`	`32`	`{`
`33`		`- if (obj instanceof ArchiveTimeStampChain)`
	`33`	`+ if (obj instanceof ArchiveTimeStampSequence)`
`34`	`34`	`{`
`35`	`35`	`return (ArchiveTimeStampSequence)obj;`
`36`	`36`	`}`
`@@ -43,7 +43,6 @@ else if (obj != null)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`private ArchiveTimeStampSequence(final ASN1Sequence sequence)`
`46`		`- throws IllegalArgumentException`
`47`	`46`	`{`
`48`	`47`	`final ASN1EncodableVector vector = new ASN1EncodableVector(sequence.size());`
`49`	`48`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ private PartialHashtree(final ASN1Sequence values)`
`51`	`51`	`{`
`52`	`52`	`for (int i = 0; i != values.size(); i++)`
`53`	`53`	`{`
`54`		`- if (!(values.getObjectAt(i) instanceof DEROctetString))`
	`54`	`+ if (!(values.getObjectAt(i) instanceof ASN1OctetString))`
`55`	`55`	`{`
`56`	`56`	`throw new IllegalArgumentException("unknown object in constructor: " + values`
`57`	`57`	`.getObjectAt(i).getClass().getName());`