relates to open-keychain#1 - removed use of ":" operator.

dghgit · dghgit · commit a3990d446848 · 2021-09-06T18:19:00.000+10:00
moved [] constructor to addAll method in ASN1EncodableVector
diff --git a/core/src/main/java/org/bouncycastle/asn1/ASN1EncodableVector.java b/core/src/main/java/org/bouncycastle/asn1/ASN1EncodableVector.java
@@ -30,15 +30,6 @@ public ASN1EncodableVector(int initialCapacity)
         this.copyOnWrite = false;
     }
 
-    public ASN1EncodableVector(ASN1Encodable[] items)
-    {
-        this();
-        for (ASN1Encodable enc : items)
-        {
-            add(enc);
-        }
-    }
-
     public void add(ASN1Encodable element)
     {
         if (null == element)
@@ -57,14 +48,29 @@ public void add(ASN1Encodable element)
         this.elementCount = minCapacity;
     }
 
+    public void addAll(ASN1Encodable[] others)
+    {
+        if (null == others)
+        {
+            throw new NullPointerException("'others' cannot be null");
+        }
+
+        doAddAll(others, "'others' elements cannot be null");
+    }
+
     public void addAll(ASN1EncodableVector other)
     {
         if (null == other)
         {
             throw new NullPointerException("'other' cannot be null");
         }
 
-        int otherElementCount = other.size();
+        doAddAll(other.elements, "'other' elements cannot be null");
+    }
+
+    private void doAddAll(ASN1Encodable[] others, String nullMsg)
+    {
+        int otherElementCount = others.length;
         if (otherElementCount < 1)
         {
             return;
@@ -80,10 +86,10 @@ public void addAll(ASN1EncodableVector other)
         int i = 0;
         do
         {
-            ASN1Encodable otherElement = other.get(i);
+            ASN1Encodable otherElement = others[i];
             if (null == otherElement)
             {
-                throw new NullPointerException("'other' elements cannot be null");
+                throw new NullPointerException(nullMsg);
             }
 
             this.elements[elementCount + i] = otherElement;
diff --git a/core/src/main/java/org/bouncycastle/asn1/x509/ExtensionsGenerator.java b/core/src/main/java/org/bouncycastle/asn1/x509/ExtensionsGenerator.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Set;
@@ -74,24 +75,24 @@ public void addExtension(
         boolean critical,
         byte[] value)
     {
-
         if (extensions.containsKey(oid))
         {
             if (dupsAllowed.contains(oid))
             {
-
                 Extension existingExtension = (Extension)extensions.get(oid);
                 ASN1Sequence seq1 = ASN1Sequence.getInstance(DEROctetString.getInstance(existingExtension.getExtnValue()).getOctets());
-                ASN1EncodableVector items = new ASN1EncodableVector();
-                for (ASN1Encodable enc : seq1)
+                ASN1Sequence seq2 = ASN1Sequence.getInstance(value);
+
+                ASN1EncodableVector items = new ASN1EncodableVector(seq1.size() + seq2.size());
+                for (Enumeration en = seq1.getObjects(); en.hasMoreElements();)
                 {
-                    items.add(enc);
+                    items.add((ASN1Encodable)en.nextElement());
                 }
-                ASN1Sequence seq2 = ASN1Sequence.getInstance(value);
-                for (ASN1Encodable enc : seq2)
+                for (Enumeration en = seq2.getObjects(); en.hasMoreElements();)
                 {
-                    items.add(enc);
+                    items.add((ASN1Encodable)en.nextElement());
                 }
+                
                 try
                 {
                     extensions.put(oid, new Extension(oid, critical, new DERSequence(items).getEncoded()));
diff --git a/core/src/test/java/org/bouncycastle/asn1/test/GenerationTest.java b/core/src/test/java/org/bouncycastle/asn1/test/GenerationTest.java
@@ -5,7 +5,6 @@
 import java.text.ParseException;
 import java.util.Date;
 
-import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1GeneralizedTime;
 import org.bouncycastle.asn1.ASN1Integer;
@@ -42,7 +41,6 @@
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.encoders.Base64;
 import org.bouncycastle.util.test.SimpleTest;
-import org.junit.Test;
 
 public class GenerationTest
     extends SimpleTest
@@ -385,8 +383,8 @@ public void testDuplicateExtensions()
 
 
         ExtensionsGenerator extensionsGenerator = new ExtensionsGenerator();
-        extensionsGenerator.addExtension(Extension.subjectAlternativeName, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name1})));
-        extensionsGenerator.addExtension(Extension.subjectAlternativeName, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name2})));
+        extensionsGenerator.addExtension(Extension.subjectAlternativeName, false, new DERSequence(name1));
+        extensionsGenerator.addExtension(Extension.subjectAlternativeName, false, new DERSequence(name2));
 
         //
         // Generate and deserialise.
@@ -434,37 +432,34 @@ public void testDuplicateExtensions()
         }
     }
 
-
-    @Test
     public void testAllowedDuplicateExtensions()
         throws Exception
     {
-
         // Testing for handling of duplicates
 
         GeneralName name1 = new GeneralName(GeneralName.dNSName, "bc1.local");
         GeneralName name2 = new GeneralName(GeneralName.dNSName, "bc2.local");
 
 
         ExtensionsGenerator extensionsGenerator = new ExtensionsGenerator();
-        extensionsGenerator.addExtension(Extension.subjectAlternativeName, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name1})));
-        extensionsGenerator.addExtension(Extension.subjectAlternativeName, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name2})));
+        extensionsGenerator.addExtension(Extension.subjectAlternativeName, false, new DERSequence(name1));
+        extensionsGenerator.addExtension(Extension.subjectAlternativeName, false, new DERSequence(name2));
 
-        extensionsGenerator.addExtension(Extension.issuerAlternativeName, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name1})));
-        extensionsGenerator.addExtension(Extension.issuerAlternativeName, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name2})));
+        extensionsGenerator.addExtension(Extension.issuerAlternativeName, false, new DERSequence(name1));
+        extensionsGenerator.addExtension(Extension.issuerAlternativeName, false, new DERSequence(name2));
 
 
-        extensionsGenerator.addExtension(Extension.subjectDirectoryAttributes, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name1})));
-        extensionsGenerator.addExtension(Extension.subjectDirectoryAttributes, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name2})));
+        extensionsGenerator.addExtension(Extension.subjectDirectoryAttributes, false, new DERSequence(name1));
+        extensionsGenerator.addExtension(Extension.subjectDirectoryAttributes, false, new DERSequence(name2));
 
-        extensionsGenerator.addExtension(Extension.certificateIssuer, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name1})));
-        extensionsGenerator.addExtension(Extension.certificateIssuer, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name2})));
+        extensionsGenerator.addExtension(Extension.certificateIssuer, false, new DERSequence(name1));
+        extensionsGenerator.addExtension(Extension.certificateIssuer, false, new DERSequence(name2));
 
 
-        extensionsGenerator.addExtension(Extension.auditIdentity, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name1})));
+        extensionsGenerator.addExtension(Extension.auditIdentity, false, new DERSequence(name1));
         try
         {
-            extensionsGenerator.addExtension(Extension.auditIdentity, false, new DERSequence(new ASN1EncodableVector(new ASN1Encodable[]{name2})));
+            extensionsGenerator.addExtension(Extension.auditIdentity, false, new DERSequence(name2));
             fail("Expected exception, not a white listed duplicate.");
         }
         catch (Exception ex)

Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,6 @@ public ASN1EncodableVector(int initialCapacity)`
`30`	`30`	`this.copyOnWrite = false;`
`31`	`31`	`}`
`32`	`32`
`33`		`- public ASN1EncodableVector(ASN1Encodable[] items)`
`34`		`- {`
`35`		`- this();`
`36`		`- for (ASN1Encodable enc : items)`
`37`		`- {`
`38`		`- add(enc);`
`39`		`- }`
`40`		`- }`
`41`		`-`
`42`	`33`	`public void add(ASN1Encodable element)`
`43`	`34`	`{`
`44`	`35`	`if (null == element)`
`@@ -57,14 +48,29 @@ public void add(ASN1Encodable element)`
`57`	`48`	`this.elementCount = minCapacity;`
`58`	`49`	`}`
`59`	`50`
	`51`	`+ public void addAll(ASN1Encodable[] others)`
	`52`	`+ {`
	`53`	`+ if (null == others)`
	`54`	`+ {`
	`55`	`+ throw new NullPointerException("'others' cannot be null");`
	`56`	`+ }`
	`57`	`+`
	`58`	`+ doAddAll(others, "'others' elements cannot be null");`
	`59`	`+ }`
	`60`	`+`
`60`	`61`	`public void addAll(ASN1EncodableVector other)`
`61`	`62`	`{`
`62`	`63`	`if (null == other)`
`63`	`64`	`{`
`64`	`65`	`throw new NullPointerException("'other' cannot be null");`
`65`	`66`	`}`
`66`	`67`
`67`		`- int otherElementCount = other.size();`
	`68`	`+ doAddAll(other.elements, "'other' elements cannot be null");`
	`69`	`+ }`
	`70`	`+`
	`71`	`+ private void doAddAll(ASN1Encodable[] others, String nullMsg)`
	`72`	`+ {`
	`73`	`+ int otherElementCount = others.length;`
`68`	`74`	`if (otherElementCount < 1)`
`69`	`75`	`{`
`70`	`76`	`return;`
`@@ -80,10 +86,10 @@ public void addAll(ASN1EncodableVector other)`
`80`	`86`	`int i = 0;`
`81`	`87`	`do`
`82`	`88`	`{`
`83`		`- ASN1Encodable otherElement = other.get(i);`
	`89`	`+ ASN1Encodable otherElement = others[i];`
`84`	`90`	`if (null == otherElement)`
`85`	`91`	`{`
`86`		`- throw new NullPointerException("'other' elements cannot be null");`
	`92`	`+ throw new NullPointerException(nullMsg);`
`87`	`93`	`}`
`88`	`94`
`89`	`95`	`this.elements[elementCount + i] = otherElement;`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import java.io.IOException;`
`4`	`4`	`import java.util.Collections;`
	`5`	`+import java.util.Enumeration;`
`5`	`6`	`import java.util.HashSet;`
`6`	`7`	`import java.util.Hashtable;`
`7`	`8`	`import java.util.Set;`
`@@ -74,24 +75,24 @@ public void addExtension(`
`74`	`75`	`boolean critical,`
`75`	`76`	`byte[] value)`
`76`	`77`	`{`
`77`		`-`
`78`	`78`	`if (extensions.containsKey(oid))`
`79`	`79`	`{`
`80`	`80`	`if (dupsAllowed.contains(oid))`
`81`	`81`	`{`
`82`		`-`
`83`	`82`	`Extension existingExtension = (Extension)extensions.get(oid);`
`84`	`83`	`ASN1Sequence seq1 = ASN1Sequence.getInstance(DEROctetString.getInstance(existingExtension.getExtnValue()).getOctets());`
`85`		`- ASN1EncodableVector items = new ASN1EncodableVector();`
`86`		`- for (ASN1Encodable enc : seq1)`
	`84`	`+ ASN1Sequence seq2 = ASN1Sequence.getInstance(value);`
	`85`	`+`
	`86`	`+ ASN1EncodableVector items = new ASN1EncodableVector(seq1.size() + seq2.size());`
	`87`	`+ for (Enumeration en = seq1.getObjects(); en.hasMoreElements();)`
`87`	`88`	`{`
`88`		`- items.add(enc);`
	`89`	`+ items.add((ASN1Encodable)en.nextElement());`
`89`	`90`	`}`
`90`		`- ASN1Sequence seq2 = ASN1Sequence.getInstance(value);`
`91`		`- for (ASN1Encodable enc : seq2)`
	`91`	`+ for (Enumeration en = seq2.getObjects(); en.hasMoreElements();)`
`92`	`92`	`{`
`93`		`- items.add(enc);`
	`93`	`+ items.add((ASN1Encodable)en.nextElement());`
`94`	`94`	`}`
	`95`	`+`
`95`	`96`	`try`
`96`	`97`	`{`
`97`	`98`	`extensions.put(oid, new Extension(oid, critical, new DERSequence(items).getEncoded()));`