Merge remote-tracking branch 'refs/remotes/origin/main'

Author: dghgit

core/src/main/java/org/bouncycastle/asn1/ASN1Sequence.java

@@ -152,6 +152,25 @@ protected ASN1Sequence(ASN1Encodable element)
         this.elements = new ASN1Encodable[]{ element };
     }
 
+    /**
+     * Create a SEQUENCE containing two objects.
+     * @param element1 the first object to be put in the SEQUENCE.
+     * @param element2 the second object to be put in the SEQUENCE.
+     */
+    protected ASN1Sequence(ASN1Encodable element1, ASN1Encodable element2)
+    {
+        if (null == element1)
+        {
+            throw new NullPointerException("'element1' cannot be null");
+        }
+        if (null == element2)
+        {
+            throw new NullPointerException("'element2' cannot be null");
+        }
+
+        this.elements = new ASN1Encodable[]{ element1, element2 };
+    }
+
     /**
      * Create a SEQUENCE containing a vector of objects.
      * @param elementVector the vector of objects to be put in the SEQUENCE.

core/src/main/java/org/bouncycastle/asn1/BERSequence.java

@@ -14,20 +14,31 @@ public class BERSequence
     extends ASN1Sequence
 {
     /**
-     * Create an empty sequence
+     * Create an empty sequence.
      */
     public BERSequence()
     {
     }
 
     /**
-     * Create a sequence containing one object
+     * Create a sequence containing one object.
+     * @param element the object to go in the sequence.
      */
     public BERSequence(ASN1Encodable element)
     {
         super(element);
     }
 
+    /**
+     * Create a sequence containing two objects.
+     * @param element1 the first object to go in the sequence.
+     * @param element2 the second object to go in the sequence.
+     */
+    public BERSequence(ASN1Encodable element1, ASN1Encodable element2)
+    {
+        super(element1, element2);
+    }
+
     /**
      * Create a sequence containing a vector of objects.
      */

core/src/main/java/org/bouncycastle/asn1/DERSequence.java

@@ -19,21 +19,31 @@ public static DERSequence convert(ASN1Sequence seq)
     private int contentsLength = -1;
 
     /**
-     * Create an empty sequence
+     * Create an empty sequence.
      */
     public DERSequence()
     {
     }
 
     /**
-     * Create a sequence containing one object
+     * Create a sequence containing one object.
      * @param element the object to go in the sequence.
      */
     public DERSequence(ASN1Encodable element)
     {
         super(element);
     }
 
+    /**
+     * Create a sequence containing two objects.
+     * @param element1 the first object to go in the sequence.
+     * @param element2 the second object to go in the sequence.
+     */
+    public DERSequence(ASN1Encodable element1, ASN1Encodable element2)
+    {
+        super(element1, element2);
+    }
+
     /**
      * Create a sequence containing a vector of objects.
      * @param elementVector the vector of objects to make up the sequence.

core/src/main/java/org/bouncycastle/asn1/DLSequence.java

@@ -11,21 +11,31 @@ public class DLSequence
     private int contentsLength = -1;
 
     /**
-     * Create an empty sequence
+     * Create an empty sequence.
      */
     public DLSequence()
     {
     }
 
     /**
-     * create a sequence containing one object
+     * Create a sequence containing one object.
      * @param element the object to go in the sequence.
      */
     public DLSequence(ASN1Encodable element)
     {
         super(element);
     }
 
+    /**
+     * Create a sequence containing two objects.
+     * @param element1 the first object to go in the sequence.
+     * @param element2 the second object to go in the sequence.
+     */
+    public DLSequence(ASN1Encodable element1, ASN1Encodable element2)
+    {
+        super(element1, element2);
+    }
+
     /**
      * create a sequence containing a vector of objects.
      * @param elementVector the vector of objects to make up the sequence.

core/src/main/java/org/bouncycastle/asn1/bc/EncryptedObjectStoreData.java

@@ -1,6 +1,5 @@
 package org.bouncycastle.asn1.bc;
 
-import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Primitive;
@@ -62,11 +61,6 @@ public AlgorithmIdentifier getEncryptionAlgorithm()
 
     public ASN1Primitive toASN1Primitive()
     {
-        ASN1EncodableVector v = new ASN1EncodableVector(2);
-
-        v.add(encryptionAlgorithm);
-        v.add(encryptedContent);
-
-        return new DERSequence(v);
+        return new DERSequence(encryptionAlgorithm, encryptedContent);
     }
 }

core/src/main/java/org/bouncycastle/asn1/bc/EncryptedPrivateKeyData.java

@@ -1,6 +1,5 @@
 package org.bouncycastle.asn1.bc;
 
-import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
@@ -70,11 +69,6 @@ public EncryptedPrivateKeyInfo getEncryptedPrivateKeyInfo()
 
     public ASN1Primitive toASN1Primitive()
     {
-        ASN1EncodableVector v = new ASN1EncodableVector(2);
-
-        v.add(encryptedPrivateKeyInfo);
-        v.add(new DERSequence(certificateChain));
-
-        return new DERSequence(v);
+        return new DERSequence(encryptedPrivateKeyInfo, new DERSequence(certificateChain));
     }
 }

core/src/main/java/org/bouncycastle/asn1/bc/EncryptedSecretKeyData.java

@@ -1,6 +1,5 @@
 package org.bouncycastle.asn1.bc;
 
-import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Primitive;
@@ -63,11 +62,6 @@ public byte[] getEncryptedKeyData()
 
     public ASN1Primitive toASN1Primitive()
     {
-        ASN1EncodableVector v = new ASN1EncodableVector(2);
-
-        v.add(keyEncryptionAlgorithm);
-        v.add(encryptedKeyData);
-
-        return new DERSequence(v);
+        return new DERSequence(keyEncryptionAlgorithm, encryptedKeyData);
     }
 }

core/src/main/java/org/bouncycastle/asn1/bc/ObjectStore.java

@@ -1,7 +1,6 @@
 package org.bouncycastle.asn1.bc;
 
 import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
@@ -96,11 +95,6 @@ public ASN1Encodable getStoreData()
 
     public ASN1Primitive toASN1Primitive()
     {
-        ASN1EncodableVector v = new ASN1EncodableVector(2);
-
-        v.add(storeData);
-        v.add(integrityCheck);
-
-        return new DERSequence(v);
+        return new DERSequence(storeData, integrityCheck);
     }
 }

core/src/main/java/org/bouncycastle/asn1/bc/SecretKeyData.java

@@ -1,6 +1,5 @@
 package org.bouncycastle.asn1.bc;
 
-import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OctetString;
@@ -62,11 +61,6 @@ public ASN1ObjectIdentifier getKeyAlgorithm()
 
     public ASN1Primitive toASN1Primitive()
     {
-        ASN1EncodableVector v = new ASN1EncodableVector(2);
-
-        v.add(keyAlgorithm);
-        v.add(keyBytes);
-
-        return new DERSequence(v);
+        return new DERSequence(keyAlgorithm, keyBytes);
     }
 }

core/src/main/java/org/bouncycastle/asn1/cryptopro/GOST28147Parameters.java

@@ -2,7 +2,6 @@
 
 import java.util.Enumeration;
 
-import org.bouncycastle.asn1.ASN1EncodableVector;
 import org.bouncycastle.asn1.ASN1Object;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OctetString;
@@ -75,12 +74,7 @@ private GOST28147Parameters(
      */
     public ASN1Primitive toASN1Primitive()
     {
-        ASN1EncodableVector v = new ASN1EncodableVector(2);
-
-        v.add(iv);
-        v.add(paramSet);
-
-        return new DERSequence(v);
+        return new DERSequence(iv, paramSet);
     }
 
     /**