Author: nextgens
Date: 2006-02-12 22:45:41 +0000 (Sun, 12 Feb 2006)
New Revision: 8034
Modified:
branches/freenet-freejvms/src/freenet/client/HighLevelSimpleClientImpl.java
branches/freenet-freejvms/src/freenet/client/SplitfileBlock.java
branches/freenet-freejvms/src/freenet/client/async/MinimalSplitfileBlock.java
branches/freenet-freejvms/src/freenet/client/async/SingleBlockInserter.java
branches/freenet-freejvms/src/freenet/keys/Key.java
branches/freenet-freejvms/src/freenet/node/Node.java
Log:
Small fixes
Modified:
branches/freenet-freejvms/src/freenet/client/HighLevelSimpleClientImpl.java
===================================================================
--- branches/freenet-freejvms/src/freenet/client/HighLevelSimpleClientImpl.java
2006-02-12 21:24:33 UTC (rev 8033)
+++ branches/freenet-freejvms/src/freenet/client/HighLevelSimpleClientImpl.java
2006-02-12 22:45:41 UTC (rev 8034)
@@ -121,7 +121,6 @@
Logger.error(this, "Bucket error: "+e);
throw new
InserterException(InserterException.INTERNAL_ERROR, e, null);
}
- ClientKey k;
InsertBlock block = new InsertBlock(b, null, insertURI);
return insert(block, false, true);
}
Modified: branches/freenet-freejvms/src/freenet/client/SplitfileBlock.java
===================================================================
--- branches/freenet-freejvms/src/freenet/client/SplitfileBlock.java
2006-02-12 21:24:33 UTC (rev 8033)
+++ branches/freenet-freejvms/src/freenet/client/SplitfileBlock.java
2006-02-12 22:45:41 UTC (rev 8034)
@@ -1,6 +1,5 @@
package freenet.client;
-import freenet.keys.FreenetURI;
import freenet.support.Bucket;
public interface SplitfileBlock {
Modified:
branches/freenet-freejvms/src/freenet/client/async/MinimalSplitfileBlock.java
===================================================================
---
branches/freenet-freejvms/src/freenet/client/async/MinimalSplitfileBlock.java
2006-02-12 21:24:33 UTC (rev 8033)
+++
branches/freenet-freejvms/src/freenet/client/async/MinimalSplitfileBlock.java
2006-02-12 22:45:41 UTC (rev 8034)
@@ -1,7 +1,6 @@
package freenet.client.async;
import freenet.client.SplitfileBlock;
-import freenet.keys.FreenetURI;
import freenet.support.Bucket;
public class MinimalSplitfileBlock implements SplitfileBlock {
Modified:
branches/freenet-freejvms/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- branches/freenet-freejvms/src/freenet/client/async/SingleBlockInserter.java
2006-02-12 21:24:33 UTC (rev 8033)
+++ branches/freenet-freejvms/src/freenet/client/async/SingleBlockInserter.java
2006-02-12 22:45:41 UTC (rev 8034)
@@ -1,7 +1,6 @@
package freenet.client.async;
import java.io.IOException;
-import java.lang.ref.SoftReference;
import java.lang.ref.WeakReference;
import java.net.MalformedURLException;
Modified: branches/freenet-freejvms/src/freenet/keys/Key.java
===================================================================
--- branches/freenet-freejvms/src/freenet/keys/Key.java 2006-02-12 21:24:33 UTC
(rev 8033)
+++ branches/freenet-freejvms/src/freenet/keys/Key.java 2006-02-12 22:45:41 UTC
(rev 8034)
@@ -3,8 +3,7 @@
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import gnu.crypto.hash.*;
import freenet.io.WritableToDataOutputStream;
import freenet.support.ArrayBucket;
@@ -69,12 +68,8 @@
*/
public synchronized double toNormalizedDouble() {
if(cachedNormalizedDouble > 0) return cachedNormalizedDouble;
- MessageDigest md;
- try {
- md = MessageDigest.getInstance("SHA-256");
- } catch (NoSuchAlgorithmException e) {
- throw new Error(e);
- }
+ IMessageDigest md=new Sha256();
+
md.update(routingKey);
int TYPE = getType();
md.update((byte)(TYPE >> 8));
Modified: branches/freenet-freejvms/src/freenet/node/Node.java
===================================================================
--- branches/freenet-freejvms/src/freenet/node/Node.java 2006-02-12
21:24:33 UTC (rev 8033)
+++ branches/freenet-freejvms/src/freenet/node/Node.java 2006-02-12
22:45:41 UTC (rev 8034)
@@ -86,7 +86,6 @@
import gnu.crypto.util.Util;
import java.security.NoSuchProviderException;
import java.security.NoSuchAlgorithmException;
-import gnu.crypto.Registry;
/**
