summaryrefslogtreecommitdiffstats
path: root/libjava/gnu/java/security/provider/DSASignature.java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/gnu/java/security/provider/DSASignature.java')
-rw-r--r--libjava/gnu/java/security/provider/DSASignature.java40
1 files changed, 31 insertions, 9 deletions
diff --git a/libjava/gnu/java/security/provider/DSASignature.java b/libjava/gnu/java/security/provider/DSASignature.java
index f33f048aebd..7da1c7dab36 100644
--- a/libjava/gnu/java/security/provider/DSASignature.java
+++ b/libjava/gnu/java/security/provider/DSASignature.java
@@ -1,5 +1,5 @@
/* DSASignature.java
- Copyright (C) 1999 Free Software Foundation, Inc.
+ Copyright (C) 1999,2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -37,7 +37,12 @@ exception statement from your version. */
package gnu.java.security.provider;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
import java.math.BigInteger;
+
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.InvalidParameterException;
@@ -52,8 +57,17 @@ import java.security.SignatureSpi;
import java.security.interfaces.DSAPrivateKey;
import java.security.interfaces.DSAPublicKey;
import java.security.spec.AlgorithmParameterSpec;
+
+import java.util.ArrayList;
+import java.util.List;
import java.util.Random;
+
+import gnu.java.io.ASN1ParsingException;
+import gnu.java.security.der.DER;
import gnu.java.security.der.DEREncodingException;
+import gnu.java.security.der.DERReader;
+import gnu.java.security.der.DERValue;
+import gnu.java.security.der.DERWriter;
public class DSASignature extends SignatureSpi
{
@@ -157,9 +171,14 @@ public class DSASignature extends SignatureSpi
BigInteger s = sha.add( x.multiply( r ) );
s = s.multiply( k.modInverse(q) ).mod( q );
- DERWriter writer = new DERWriter();
- return writer.joinarrays( writer.writeBigInteger( r ), writer.writeBigInteger( s ) );
-
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ ArrayList seq = new ArrayList(2);
+ seq.set(0, new DERValue(DER.INTEGER, r));
+ seq.set(1, new DERValue(DER.INTEGER, s));
+ DERWriter.write(bout, new DERValue(DER.CONSTRUCTED | DER.SEQUENCE, seq));
+ return bout.toByteArray();
+ } catch (IOException ioe) {
+ throw new SignatureException();
} catch ( ArithmeticException ae ) {
throw new SignatureException();
}
@@ -180,9 +199,12 @@ public class DSASignature extends SignatureSpi
{
//Decode sigBytes from ASN.1 DER encoding
try {
- DERReader reader = new DERReader( sigBytes );
- BigInteger r = reader.getBigInteger();
- BigInteger s = reader.getBigInteger();
+ DERReader in = new DERReader(sigBytes);
+ DERValue val = in.read();
+ if (!val.isConstructed())
+ throw new SignatureException("badly formed signature");
+ BigInteger r = (BigInteger) in.read().getValue();
+ BigInteger s = (BigInteger) in.read().getValue();
BigInteger g = publicKey.getParams().getG();
BigInteger p = publicKey.getParams().getP();
@@ -206,8 +228,8 @@ public class DSASignature extends SignatureSpi
return true;
else
return false;
- } catch ( DEREncodingException deree ) {
- throw new SignatureException();
+ } catch (IOException ioe) {
+ throw new SignatureException("badly formed signature");
}
}
OpenPOWER on IntegriCloud