[freenet-cvs] r7758 - in trunk/freenet/src/freenet: crypt node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-05 18:22:00 +0000 (Thu, 05 Jan 2006)
New Revision: 7758

Modified:
   trunk/freenet/src/freenet/crypt/DSA.java
   trunk/freenet/src/freenet/crypt/Global.java
   trunk/freenet/src/freenet/node/Version.java
Log:
312:
Make DSA demo/benchmark/test use new 2048/256 group.

Modified: trunk/freenet/src/freenet/crypt/DSA.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSA.java    2006-01-05 17:55:58 UTC (rev 
7757)
+++ trunk/freenet/src/freenet/crypt/DSA.java    2006-01-05 18:22:00 UTC (rev 
7758)
@@ -90,7 +90,7 @@

     public static void main(String[] args) throws Exception {
        //DSAGroup g=DSAGroup.readFromField(args[0]);
-       DSAGroup g = Global.DSAgroupB;
+       DSAGroup g = Global.DSAgroupBigA;
         //Yarrow y=new Yarrow();
        DummyRandomSource y = new DummyRandomSource();
         DSAPrivateKey pk=new DSAPrivateKey(g, y);
@@ -132,13 +132,15 @@
                long t3 = System.currentTimeMillis();
                totalTimeSigning += (t2 - t1);
                totalTimeVerifying += (t3 - t2);
-               int rSize = sig.getR().toByteArray().length;
+               int rSize = sig.getR().bitLength();
+               rSize = (rSize / 8) + (rSize % 8 == 0 ? 0 : 1);
                totalRSize += rSize;
                if(rSize > maxRSize) maxRSize = rSize;
                int rUnsignedBitSize = sig.getR().bitLength();
                totalRUnsignedBitSize += rUnsignedBitSize;
                maxRUnsignedBitSize = Math.max(maxRUnsignedBitSize, 
rUnsignedBitSize);
-               int sSize = sig.getS().toByteArray().length;
+               int sSize = sig.getS().bitLength();
+               sSize = sSize / 8 +  (sSize % 8 == 0 ? 0 : 1);
                totalSSize += sSize;
                if(sSize > maxSSize) maxSSize = sSize;
         }

Modified: trunk/freenet/src/freenet/crypt/Global.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Global.java 2006-01-05 17:55:58 UTC (rev 
7757)
+++ trunk/freenet/src/freenet/crypt/Global.java 2006-01-05 18:22:00 UTC (rev 
7758)
@@ -20,11 +20,11 @@
        public static final DSAGroup DSAgroupBigA = 
                new DSAGroup(
                        new NativeBigInteger( /* p */
-                               
"8608ac4f55361337f2a3e38ab1864ff3c98d66411d8d2afc9c526320c541f65078e86bc78494a5d73e4a9a67583f941f2993ed6c97dbc795dd88f0915c9cfbffc7e5373cde13e3c7ca9073b9106eb31bf82272ed0057f984a870a19f8a83bfa707d16440c382e62d3890473ea79e9d50c4ac6b1f1d30b10c32a02f685833c6278fc29eb3439c5333885614a115219b3808c92a37a0f365cd5e61b5861761dad9eff0ce23250f558848f8db932b87a3bd8d7a2f7cf99c75822bdc2fb7c1a1d78d0bcf81488ae0de5269ff853ab8b8f1f2bf3e6c0564573f612808f68dbfef49d5c9b4a705794cf7a424cd4eb1e0260552e67bfc1fa37b4a1f78b757ef185e86e9"),
+                               
"008608ac4f55361337f2a3e38ab1864ff3c98d66411d8d2afc9c526320c541f65078e86bc78494a5d73e4a9a67583f941f2993ed6c97dbc795dd88f0915c9cfbffc7e5373cde13e3c7ca9073b9106eb31bf82272ed0057f984a870a19f8a83bfa707d16440c382e62d3890473ea79e9d50c4ac6b1f1d30b10c32a02f685833c6278fc29eb3439c5333885614a115219b3808c92a37a0f365cd5e61b5861761dad9eff0ce23250f558848f8db932b87a3bd8d7a2f7cf99c75822bdc2fb7c1a1d78d0bcf81488ae0de5269ff853ab8b8f1f2bf3e6c0564573f612808f68dbfef49d5c9b4a705794cf7a424cd4eb1e0260552e67bfc1fa37b4a1f78b757ef185e86e9",
 16),
                        new NativeBigInteger( /* q */
-                               
"b143368abcd51f58d6440d5417399339a4d15bef096a2c5d8e6df44f52d6d379"),
+                               
"00b143368abcd51f58d6440d5417399339a4d15bef096a2c5d8e6df44f52d6d379", 16),
                        new NativeBigInteger( /* g */
-                               
"51a45ab670c1c9fd10bd395a6805d33339f5675e4b0d35defc9fa03aa5c2bf4ce9cfcdc256781291bfff6d546e67d47ae4e160f804ca72ec3c5492709f5f80f69e6346dd8d3e3d8433b6eeef63bce7f98574185c6aff161c9b536d76f873137365a4246cf414bfe8049ee11e31373cd0a6558e2950ef095320ce86218f992551cc292224114f3b60146d22dd51f8125c9da0c028126ffa85efd4f4bfea2c104453329cc1268a97e9a835c14e4a9a43c6a1886580e35ad8f1de230e1af32208ef9337f1924702a4514e95dc16f30f0c11e714a112ee84a9d8d6c9bc9e74e336560bb5cd4e91eabf6dad26bf0ca04807f8c31a2fc18ea7d45baab7cc997b53c356"));
+                               
"51a45ab670c1c9fd10bd395a6805d33339f5675e4b0d35defc9fa03aa5c2bf4ce9cfcdc256781291bfff6d546e67d47ae4e160f804ca72ec3c5492709f5f80f69e6346dd8d3e3d8433b6eeef63bce7f98574185c6aff161c9b536d76f873137365a4246cf414bfe8049ee11e31373cd0a6558e2950ef095320ce86218f992551cc292224114f3b60146d22dd51f8125c9da0c028126ffa85efd4f4bfea2c104453329cc1268a97e9a835c14e4a9a43c6a1886580e35ad8f1de230e1af32208ef9337f1924702a4514e95dc16f30f0c11e714a112ee84a9d8d6c9bc9e74e336560bb5cd4e91eabf6dad26bf0ca04807f8c31a2fc18ea7d45baab7cc997b53c356",
 16));

     public static final DSAGroup 
     /* -- DSA Group A (v2)-----------------------------------

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-05 17:55:58 UTC (rev 
7757)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-05 18:22:00 UTC (rev 
7758)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 311;
+       public static final int buildNumber = 312;

        /** Oldest build of Fred we will talk to */
        public static final int lastGoodBuild = 310;