Author: nextgens
Date: 2007-04-22 16:19:55 +0000 (Sun, 22 Apr 2007)
New Revision: 12870
Removed:
trunk/apps/Thaw/src/thaw/plugins/signatures/RandomSource.java
Modified:
trunk/apps/Thaw/src/thaw/core/Core.java
trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
Log:
Thaw: create thaw.core/Core.getRandom() and use it
Modified: trunk/apps/Thaw/src/thaw/core/Core.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/Core.java 2007-04-22 16:03:22 UTC (rev
12869)
+++ trunk/apps/Thaw/src/thaw/core/Core.java 2007-04-22 16:19:55 UTC (rev
12870)
@@ -1,15 +1,16 @@
package thaw.core;
-import java.io.IOException;
-import java.util.LinkedList;
import java.util.Observable;
import java.util.Observer;
+import java.util.Random;
import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JOptionPane;
import javax.swing.UIManager;
+import freenet.crypt.Yarrow;
+
import thaw.fcp.FCPClientHello;
import thaw.fcp.FCPConnection;
import thaw.fcp.FCPQueryManager;
@@ -43,6 +44,8 @@
public final static int TIME_BETWEEN_EACH_TRY = 5000;
private ReconnectionManager reconnectionManager = null;
+
+ private static final Random RANDOM = new Yarrow();
// MDNS stuffs
private MDNSDiscovery discovery;
@@ -595,4 +598,9 @@
}
}
+
+ public static Random getRandom() {
+ return RANDOM;
+ }
+
}
Modified: trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java 2007-04-22
16:03:22 UTC (rev 12869)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/Identity.java 2007-04-22
16:19:55 UTC (rev 12870)
@@ -2,12 +2,9 @@
import java.awt.Color;
-import java.security.MessageDigest;
-
import java.sql.*;
import java.util.Vector;
-import java.util.Iterator;
import java.math.BigInteger;
import freenet.crypt.SHA256;
@@ -15,11 +12,12 @@
import freenet.crypt.DSA;
import freenet.crypt.DSAPrivateKey;
-import freenet.crypt.DSAGroup;
import freenet.crypt.DSAPublicKey;
import freenet.crypt.DSASignature;
import freenet.crypt.Global;
+import freenet.crypt.RandomSource;
+import thaw.core.Core;
import thaw.core.Logger;
import thaw.plugins.Hsqldb;
@@ -105,9 +103,7 @@
public static Identity generate(Hsqldb db, String nick) {
Logger.info(nick, "thaw.plugins.signatures.Identity :
Generating new identity ...");
- freenet.crypt.RandomSource randomSource =
thaw.plugins.signatures.RandomSource.getRandomSource();
-
- DSAPrivateKey privateKey = new
DSAPrivateKey(Global.DSAgroupBigA, randomSource);
+ DSAPrivateKey privateKey = new
DSAPrivateKey(Global.DSAgroupBigA, Core.getRandom());
DSAPublicKey publicKey = new DSAPublicKey(Global.DSAgroupBigA,
privateKey);
Identity identity = new Identity(db, -1, nick,
@@ -171,8 +167,6 @@
public static DSASignature sign(String text, byte[] x) {
- freenet.crypt.RandomSource randomSource =
thaw.plugins.signatures.RandomSource.getRandomSource();
-
BigInteger m;
@@ -187,7 +181,7 @@
DSASignature sign = DSA.sign(Global.DSAgroupBigA,
new DSAPrivateKey(new
BigInteger(x)),
m,
- randomSource);
+ (RandomSource)Core.getRandom());
return sign;
Deleted: trunk/apps/Thaw/src/thaw/plugins/signatures/RandomSource.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/signatures/RandomSource.java
2007-04-22 16:03:22 UTC (rev 12869)
+++ trunk/apps/Thaw/src/thaw/plugins/signatures/RandomSource.java
2007-04-22 16:19:55 UTC (rev 12870)
@@ -1,23 +0,0 @@
-package thaw.plugins.signatures;
-
-import freenet.crypt.Yarrow;
-
-
-/**
- * Not really usefull at the moment.
- * Later it will store the last
- * Note for later: it was really really stupid from my part to call it
'RandomSource' ....
- */
-public class RandomSource {
-
- private static freenet.crypt.RandomSource randomSource = null;
-
- public static freenet.crypt.RandomSource getRandomSource() {
- if (randomSource == null)
- randomSource = new Yarrow();
-
- return randomSource;
- }
-
-
-}
