Author: toad
Date: 2006-01-12 22:53:40 +0000 (Thu, 12 Jan 2006)
New Revision: 7848
Modified:
trunk/freenet/src/freenet/crypt/DSAPublicKey.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/SSKInsertHandler.java
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
Log:
344 (mandatory): Fix SSKs. Now they work. :)
Modified: trunk/freenet/src/freenet/crypt/DSAPublicKey.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DSAPublicKey.java 2006-01-12 18:52:36 UTC
(rev 7847)
+++ trunk/freenet/src/freenet/crypt/DSAPublicKey.java 2006-01-12 22:53:40 UTC
(rev 7848)
@@ -14,7 +14,7 @@
/** A cache of the hexadecimal string representation of y */
private final String yAsHexString;
- public static final int PADDED_SIZE = 660;
+ public static final int PADDED_SIZE = 1024;
private final DSAGroup group;
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-01-12 18:52:36 UTC (rev
7847)
+++ trunk/freenet/src/freenet/node/Node.java 2006-01-12 22:53:40 UTC (rev
7848)
@@ -974,8 +974,11 @@
pubKey = getKey(k.getPubKeyHash());
k.setPubKey(pubKey);
}
- if(pubKey != null)
+ if(pubKey != null) {
chk = sskDatastore.fetch((NodeSSK)key, !cache);
+ } else {
+ Logger.minor(this, "Not found because no
pubkey: "+uid);
+ }
} else
throw new IllegalStateException("Unknown key type:
"+key.getClass());
} catch (IOException e) {
Modified: trunk/freenet/src/freenet/node/SSKInsertHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/SSKInsertHandler.java 2006-01-12
18:52:36 UTC (rev 7847)
+++ trunk/freenet/src/freenet/node/SSKInsertHandler.java 2006-01-12
22:53:40 UTC (rev 7848)
@@ -206,7 +206,7 @@
int status = sender.getStatus();
- if(status == CHKInsertSender.NOT_FINISHED) {
+ if(status == SSKInsertSender.NOT_FINISHED) {
continue;
}
@@ -224,14 +224,14 @@
return;
}
// Might as well store it anyway.
- if(status == CHKInsertSender.TIMED_OUT ||
- status ==
CHKInsertSender.GENERATED_REJECTED_OVERLOAD)
+ if(status == SSKInsertSender.TIMED_OUT ||
+ status ==
SSKInsertSender.GENERATED_REJECTED_OVERLOAD)
canCommit = true;
finish();
return;
}
- if(status == CHKInsertSender.ROUTE_NOT_FOUND || status ==
CHKInsertSender.ROUTE_REALLY_NOT_FOUND) {
+ if(status == SSKInsertSender.ROUTE_NOT_FOUND || status ==
SSKInsertSender.ROUTE_REALLY_NOT_FOUND) {
Message msg = DMT.createFNPRouteNotFound(uid, sender.getHTL());
try {
source.send(msg);
@@ -244,7 +244,7 @@
return;
}
- if(status == CHKInsertSender.SUCCESS) {
+ if(status == SSKInsertSender.SUCCESS) {
Message msg = DMT.createFNPInsertReply(uid);
sentSuccess = true;
try {
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-12 18:52:36 UTC (rev
7847)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-12 22:53:40 UTC (rev
7848)
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 343;
+ public static final int buildNumber = 344;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 343;
+ public static final int lastGoodBuild = 344;
/** The highest reported build of fred */
public static int highestSeenBuild = buildNumber;
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-01-12
18:52:36 UTC (rev 7847)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2006-01-12
22:53:40 UTC (rev 7848)
@@ -373,11 +373,11 @@
byte[] header = block.getRawHeaders();
if(data.length!=dataBlockSize) {
- Logger.minor(this, "This data is "+data.length+" bytes. Should
be "+dataBlockSize);
+ Logger.error(this, "This data is "+data.length+" bytes. Should
be "+dataBlockSize);
return;
}
if(header.length!=headerBlockSize) {
- Logger.minor(this, "This header is "+data.length+" bytes.
Should be "+headerBlockSize);
+ Logger.error(this, "This header is "+data.length+" bytes.
Should be "+headerBlockSize);
return;
}
@@ -443,10 +443,10 @@
return;
byte[] routingkey = hash;
- byte[] data = key.asBytes();
+ byte[] data = key.asPaddedBytes();
if(data.length!=dataBlockSize) {
- Logger.minor(this, "This data is "+data.length+" bytes. Should
be "+dataBlockSize);
+ Logger.error(this, "This data is "+data.length+" bytes. Should
be "+dataBlockSize);
return;
}
