Author: j16sdiz
Date: 2008-10-24 15:24:54 +0000 (Fri, 24 Oct 2008)
New Revision: 23082
Modified:
trunk/freenet/src/freenet/crypt/DiffieHellman.java
trunk/freenet/src/freenet/crypt/SHA256.java
trunk/freenet/src/freenet/crypt/Yarrow.java
Log:
generic
Modified: trunk/freenet/src/freenet/crypt/DiffieHellman.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DiffieHellman.java 2008-10-24 14:51:19 UTC
(rev 23081)
+++ trunk/freenet/src/freenet/crypt/DiffieHellman.java 2008-10-24 15:24:54 UTC
(rev 23082)
@@ -35,7 +35,7 @@
private static Random r;
private static DHGroup group = Global.DHgroupA;
- private static Stack precalcBuffer = new Stack();
+ private static Stack<NativeBigInteger[]> precalcBuffer = new
Stack<NativeBigInteger[]>();
private static Object precalcerWaitObj = new Object();
private static NativeThread precalcThread;
@@ -114,10 +114,10 @@
public static NativeBigInteger[] getParams() {
synchronized (precalcBuffer) {
//Ensure that we will have something to pop (at least
pretty soon)
- askRefill();
+ askRefill();
if(!precalcBuffer.isEmpty()) {
- return (NativeBigInteger[]) precalcBuffer.pop();
+ return precalcBuffer.pop();
}
}
Modified: trunk/freenet/src/freenet/crypt/SHA256.java
===================================================================
--- trunk/freenet/src/freenet/crypt/SHA256.java 2008-10-24 14:51:19 UTC (rev
23081)
+++ trunk/freenet/src/freenet/crypt/SHA256.java 2008-10-24 15:24:54 UTC (rev
23082)
@@ -76,7 +76,7 @@
}
}
- static private final Vector digests = new Vector();
+ static private final Vector<MessageDigest> digests = new
Vector<MessageDigest>();
/**
* Create a new SHA-256 MessageDigest
@@ -85,7 +85,7 @@
public synchronized static MessageDigest getMessageDigest() {
try {
if(!digests.isEmpty())
- return (MessageDigest)
digests.remove(digests.size() - 1);
+ return digests.remove(digests.size() - 1);
return MessageDigest.getInstance("SHA-256");
} catch(NoSuchAlgorithmException e2) {
//TODO: maybe we should point to a HOWTO for freejvms
Modified: trunk/freenet/src/freenet/crypt/Yarrow.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Yarrow.java 2008-10-24 14:51:19 UTC (rev
23081)
+++ trunk/freenet/src/freenet/crypt/Yarrow.java 2008-10-24 15:24:54 UTC (rev
23082)
@@ -179,7 +179,7 @@
EntropySource startupEntropy = new EntropySource();
// Consume the system properties list
- for(Enumeration enu = sys.propertyNames();
enu.hasMoreElements();) {
+ for(Enumeration<?> enu = sys.propertyNames();
enu.hasMoreElements();) {
String key = (String) enu.nextElement();
consumeString(key);
consumeString(sys.getProperty(key));
@@ -237,7 +237,7 @@
}
private long timeLastWroteSeed = -1;
- public void write_seed(File filename) {
+ private void write_seed(File filename) {
write_seed(filename, false);
}
@@ -421,12 +421,12 @@
private MessageDigest fast_pool, slow_pool;
private int fast_entropy, slow_entropy;
private boolean fast_select;
- private Hashtable entropySeen;
+ private Hashtable<EntropySource, Integer> entropySeen;
private void accumulator_init(String digest) throws
NoSuchAlgorithmException {
fast_pool = MessageDigest.getInstance(digest);
slow_pool = MessageDigest.getInstance(digest);
- entropySeen = new Hashtable();
+ entropySeen = new Hashtable<EntropySource, Integer>();
}
@Override
@@ -489,7 +489,7 @@
slow_entropy += actualEntropy;
if(source != null) {
- Integer contributedEntropy = (Integer)
entropySeen.get(source);
+ Integer contributedEntropy =
entropySeen.get(source);
if(contributedEntropy == null)
contributedEntropy = new
Integer(actualEntropy);
else
@@ -500,7 +500,7 @@
int kc = 0;
for(Enumeration enu =
entropySeen.keys(); enu.hasMoreElements();) {
Object key =
enu.nextElement();
- Integer v = (Integer)
entropySeen.get(key);
+ Integer v =
entropySeen.get(key);
if(DEBUG)
Logger.normal(this, "Key: <" + key + "> " + v);
if(v.intValue() >
SLOW_THRESHOLD) {
@@ -636,9 +636,9 @@
fast_pool_reseed();
slow_entropy = 0;
- Integer ZERO = new Integer(0);
- for(Enumeration enu = entropySeen.keys();
enu.hasMoreElements();)
- entropySeen.put(enu.nextElement(), ZERO);
+ Integer ZERO = 0;
+ for(EntropySource src : entropySeen.keySet())
+ entropySeen.put(src, ZERO);
}
/**
* 5.4 Reseed Control parameters
