[freenet-cvs] r17320 - trunk/freenet/src/freenet/crypt

[nextgens at freenetproject.org]

Author: nextgens
Date: 2008-01-27 13:58:03 +0000 (Sun, 27 Jan 2008)
New Revision: 17320

Modified:
   trunk/freenet/src/freenet/crypt/DSAPrivateKey.java
Log:
More paranoia

Modified: trunk/freenet/src/freenet/crypt/DSAPrivateKey.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAPrivateKey.java	2008-01-27 13:49:37 UTC (rev 17319)
+++ trunk/freenet/src/freenet/crypt/DSAPrivateKey.java	2008-01-27 13:58:03 UTC (rev 17320)
@@ -19,9 +19,9 @@
 
     private final BigInteger x;
 
-    public DSAPrivateKey(BigInteger x) {
+    public DSAPrivateKey(BigInteger x, DSAGroup g) {
         this.x = x;
-        if(x.signum() != 1)
+        if(x.signum() != 1 || x.compareTo(g.getQ()) > -1 || x.compareTo(BigInteger.ZERO) < 1)
         	throw new IllegalArgumentException();
     }
 
@@ -47,8 +47,8 @@
         return x;
     }
     
-    public static CryptoKey read(InputStream i) throws IOException {
-        return new DSAPrivateKey(Util.readMPI(i));
+    public static CryptoKey read(InputStream i, DSAGroup g) throws IOException {
+        return new DSAPrivateKey(Util.readMPI(i), g);
     }
     
     public String toLongString() {
@@ -79,7 +79,7 @@
 		NativeBigInteger y = new NativeBigInteger(1, Base64.decode(fs.get("x")));
 		if(y.bitLength() > 512)
 			throw new IllegalBase64Exception("Probably a pubkey");
-		return new DSAPrivateKey(y);
+		return new DSAPrivateKey(y, group);
 	}
     
 //    public static void main(String[] args) throws Exception {