Update of /cvsroot/freenet/freenet/src/freenet/node/states/FCP
In directory sc8-pr-cvs1:/tmp/cvs-serv5586/src/freenet/node/states/FCP
Modified Files:
NewGenerateSVKPair.java NewClientPut.java
Log Message:
Work around problem with ThrottleAsyncEntropyYarrow/Yarrow initialization order.
Made randSource in Core private and started exposing it though a getter instead of
directly.
Index: NewGenerateSVKPair.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewGenerateSVKPair.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- NewGenerateSVKPair.java 4 Oct 2003 01:17:03 -0000 1.4
+++ NewGenerateSVKPair.java 27 Oct 2003 14:45:19 -0000 1.5
@@ -21,7 +21,7 @@
throw new BadStateException("expecting GenerateSVKPair");
ClientSVK svk;
try {
- svk = new ClientSVK(n.randSource);
+ svk = new ClientSVK(n.getRandSource());
} catch (KeyException e) {
Core.logger.log(this, "KeyException creating ClientSVK: "+e, e,
Logger.ERROR);
sendMessage(new Failed(id, "Internal Error: KeyException creating
ClientSVK: "+e));
@@ -31,7 +31,7 @@
fs.put("PrivateKey", Base64.encode(svk.getPrivateKey()));
fs.put("PublicKey", Base64.encode(svk.getPublicKeyFingerPrint()));
byte[] cryptoKey = new byte[16]; // 64 bits should be plenty
- n.randSource.nextBytes(cryptoKey);
+ n.getRandSource().nextBytes(cryptoKey);
fs.put("CryptoKey", Base64.encode(cryptoKey));
sendMessage(new Success(id, fs));
return null;
Index: NewClientPut.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/FCP/NewClientPut.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- NewClientPut.java 15 Oct 2003 00:50:27 -0000 1.10
+++ NewClientPut.java 27 Oct 2003 14:45:19 -0000 1.11
@@ -56,7 +56,7 @@
// initialize the ClientKey
FreenetURI uri = cpmo.getURI();
ClientKey ckey =
- AbstractClientKey.createFromInsertURI(n.randSource, uri);
+ AbstractClientKey.createFromInsertURI(n.getRandSource(), uri);
String cipher = cpmo.otherFields.get("Cipher");
if (cipher != null) ckey.setCipher(cipher);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
