Refactor StandardDSAEncoding

peterdettman · peterdettman · commit ab5caf68f4e2 · 2026-02-05T16:44:00.000+07:00
diff --git a/core/src/main/java/org/bouncycastle/crypto/signers/StandardDSAEncoding.java b/core/src/main/java/org/bouncycastle/crypto/signers/StandardDSAEncoding.java
@@ -16,17 +16,9 @@ public class StandardDSAEncoding
 {
     public static final StandardDSAEncoding INSTANCE = new StandardDSAEncoding();
 
-    public byte[] encode(BigInteger n, BigInteger r, BigInteger s) throws IOException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        encodeValue(n, v, r);
-        encodeValue(n, v, s);
-        return new DERSequence(v).getEncoded(ASN1Encoding.DER);
-    }
-
     public BigInteger[] decode(BigInteger n, byte[] encoding) throws IOException
     {
-        ASN1Sequence seq = (ASN1Sequence)ASN1Primitive.fromByteArray(encoding);
+        ASN1Sequence seq = ASN1Sequence.getInstance(encoding);
         if (seq.size() == 2)
         {
             BigInteger r = decodeValue(n, seq, 0);
@@ -42,6 +34,14 @@ public BigInteger[] decode(BigInteger n, byte[] encoding) throws IOException
         throw new IllegalArgumentException("Malformed signature");
     }
 
+    public byte[] encode(BigInteger n, BigInteger r, BigInteger s) throws IOException
+    {
+        return new DERSequence(
+            encodeValue(n, r),
+            encodeValue(n, s)
+        ).getEncoded(ASN1Encoding.DER);
+    }
+
     protected BigInteger checkValue(BigInteger n, BigInteger x)
     {
         if (x.signum() < 0 || (null != n && x.compareTo(n) >= 0))
@@ -57,8 +57,8 @@ protected BigInteger decodeValue(BigInteger n, ASN1Sequence s, int pos)
         return checkValue(n, ((ASN1Integer)s.getObjectAt(pos)).getValue());
     }
 
-    protected void encodeValue(BigInteger n, ASN1EncodableVector v, BigInteger x)
+    protected ASN1Integer encodeValue(BigInteger n, BigInteger x)
     {
-        v.add(new ASN1Integer(checkValue(n, x)));
+        return new ASN1Integer(checkValue(n, x));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,17 +16,9 @@ public class StandardDSAEncoding`
`16`	`16`	`{`
`17`	`17`	`public static final StandardDSAEncoding INSTANCE = new StandardDSAEncoding();`
`18`	`18`
`19`		`- public byte[] encode(BigInteger n, BigInteger r, BigInteger s) throws IOException`
`20`		`- {`
`21`		`- ASN1EncodableVector v = new ASN1EncodableVector();`
`22`		`- encodeValue(n, v, r);`
`23`		`- encodeValue(n, v, s);`
`24`		`- return new DERSequence(v).getEncoded(ASN1Encoding.DER);`
`25`		`- }`
`26`		`-`
`27`	`19`	`public BigInteger[] decode(BigInteger n, byte[] encoding) throws IOException`
`28`	`20`	`{`
`29`		`- ASN1Sequence seq = (ASN1Sequence)ASN1Primitive.fromByteArray(encoding);`
	`21`	`+ ASN1Sequence seq = ASN1Sequence.getInstance(encoding);`
`30`	`22`	`if (seq.size() == 2)`
`31`	`23`	`{`
`32`	`24`	`BigInteger r = decodeValue(n, seq, 0);`
`@@ -42,6 +34,14 @@ public BigInteger[] decode(BigInteger n, byte[] encoding) throws IOException`
`42`	`34`	`throw new IllegalArgumentException("Malformed signature");`
`43`	`35`	`}`
`44`	`36`
	`37`	`+ public byte[] encode(BigInteger n, BigInteger r, BigInteger s) throws IOException`
	`38`	`+ {`
	`39`	`+ return new DERSequence(`
	`40`	`+ encodeValue(n, r),`
	`41`	`+ encodeValue(n, s)`
	`42`	`+ ).getEncoded(ASN1Encoding.DER);`
	`43`	`+ }`
	`44`	`+`
`45`	`45`	`protected BigInteger checkValue(BigInteger n, BigInteger x)`
`46`	`46`	`{`
`47`	`47`	`if (x.signum() < 0 \|\| (null != n && x.compareTo(n) >= 0))`
`@@ -57,8 +57,8 @@ protected BigInteger decodeValue(BigInteger n, ASN1Sequence s, int pos)`
`57`	`57`	`return checkValue(n, ((ASN1Integer)s.getObjectAt(pos)).getValue());`
`58`	`58`	`}`
`59`	`59`
`60`		`- protected void encodeValue(BigInteger n, ASN1EncodableVector v, BigInteger x)`
	`60`	`+ protected ASN1Integer encodeValue(BigInteger n, BigInteger x)`
`61`	`61`	`{`
`62`		`- v.add(new ASN1Integer(checkValue(n, x)));`
	`62`	`+ return new ASN1Integer(checkValue(n, x));`
`63`	`63`	`}`
`64`	`64`	`}`