Author: toad
Date: 2007-06-27 17:55:09 +0000 (Wed, 27 Jun 2007)
New Revision: 13783
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/NodeARKInserter.java
trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
Remove oldARK support (workaround for 1010 crypto transition, obsolete ages
ago).
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-06-27 17:41:29 UTC (rev
13782)
+++ trunk/freenet/src/freenet/node/Node.java 2007-06-27 17:55:09 UTC (rev
13783)
@@ -325,10 +325,6 @@
/** My ARK sequence number */
long myARKNumber;
// FIXME remove old ARK support
- /** My old ARK SSK private key */
- InsertableClientSSK myOldARK;
- /** My old ARK sequence number */
- long myOldARKNumber;
/** FetchContext for ARKs */
public final FetchContext arkFetcherContext;
@@ -551,8 +547,6 @@
// ARK
- boolean arkIsOld = false;
-
String s = fs.get("ark.number");
String privARK = fs.get("ark.privURI");
@@ -560,9 +554,11 @@
if(privARK != null) {
FreenetURI uri = new FreenetURI(privARK);
ark = InsertableClientSSK.create(uri);
- arkIsOld = ark.isInsecure();
- if(s == null) {
+ if(ark.isInsecure() || s == null) {
+ if(ark.isInsecure())
+ System.out.println("Creating
new ARK, old is insecure");
ark = null;
+ myARKNumber = 0;
} else {
try {
myARKNumber = Long.parseLong(s);
@@ -582,46 +578,6 @@
}
this.myARK = ark;
- if(arkIsOld) {
- System.out.println("Creating new ARK, old is insecure");
- myOldARKNumber = myARKNumber;
- myOldARK = myARK;
- myARK = InsertableClientSSK.createRandom(r, "ark");
- myARKNumber = 0;
- } else {
- ark = null;
- // FIXME remove in a few versions; back compat support
for 1012 only
- // and not very important; remove in 1014??
- // Note that "old-ark" doesn't work because it is
stripped by the manually
- // posted references filter.
- s = fs.get("oldark.number");
- if(s == null) s = fs.get("old-ark.number");
- privARK = fs.get("oldark.privURI");
- if(privARK == null) privARK = fs.get("old-ark.privURI");
- try {
- if(privARK != null) {
- FreenetURI uri = new
FreenetURI(privARK);
- ark = InsertableClientSSK.create(uri);
- arkIsOld = ark.isInsecure();
- if(s == null) {
- ark = null;
- } else {
- try {
- myOldARKNumber =
Long.parseLong(s);
- } catch (NumberFormatException
e) {
- myOldARKNumber = 0;
- ark = null;
- }
- }
- }
- } catch (MalformedURLException e) {
- Logger.minor(this, "Caught "+e, e);
- ark = null;
- }
- this.myOldARK = ark;
-
- }
-
wasTestnet = Fields.stringToBool(fs.get("testnet"), false);
}
@@ -1728,9 +1684,6 @@
SimpleFieldSet fs = exportPublicFieldSet(false);
fs.put("dsaPrivKey", myPrivKey.asFieldSet());
fs.putSingle("ark.privURI",
this.myARK.getInsertURI().toString(false, false));
- if(myOldARK != null) {
- fs.putSingle("oldark.privURI",
this.myOldARK.getInsertURI().toString(false, false));
- }
return fs;
}
@@ -1775,10 +1728,6 @@
}
fs.put("ark.number", myARKNumber); // Can be changed on setup
fs.putSingle("ark.pubURI", this.myARK.getURI().toString(false,
false)); // Can be changed on setup
- if(myOldARK != null) {
- fs.put("oldark.number", myOldARKNumber);
- fs.putSingle("oldark.pubURI",
this.myOldARK.getURI().toString(false, false));
- }
synchronized (referenceSync) {
if(myReferenceSignature == null || mySignedReference ==
null || !mySignedReference.equals(fs.toOrderedString())){
Modified: trunk/freenet/src/freenet/node/NodeARKInserter.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeARKInserter.java 2007-06-27 17:41:29 UTC
(rev 13782)
+++ trunk/freenet/src/freenet/node/NodeARKInserter.java 2007-06-27 17:55:09 UTC
(rev 13783)
@@ -31,16 +31,14 @@
private final Node node;
private final NodeIPDetector detector;
private static boolean logMINOR;
- private final boolean old;
/**
* @param node
* @param old If true, use the old ARK rather than the new ARK
*/
- NodeARKInserter(Node node, NodeIPDetector detector, boolean old) {
+ NodeARKInserter(Node node, NodeIPDetector detector) {
this.node = node;
this.detector = detector;
- this.old = old;
logMINOR = Logger.shouldLog(Logger.MINOR, this);
}
@@ -130,8 +128,8 @@
Bucket b = new SimpleReadOnlyArrayBucket(buf);
- long number = old ? node.myOldARKNumber : node.myARKNumber;
- InsertableClientSSK ark = old ? node.myOldARK : node.myARK;
+ long number = node.myARKNumber;
+ InsertableClientSSK ark = node.myARK;
FreenetURI uri =
ark.getInsertURI().setKeyType("USK").setSuggestedEdition(number);
if(logMINOR) Logger.minor(this, "Inserting ARK: "+uri);
Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java 2007-06-27 17:41:29 UTC
(rev 13782)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java 2007-06-27 17:55:09 UTC
(rev 13783)
@@ -52,8 +52,6 @@
public boolean includeLocalAddressesInNoderefs;
/** ARK inserter. */
private final NodeARKInserter arkPutter;
- // FIXME remove old ARK support
- private final NodeARKInserter oldARKPutter;
/** Set when we have grounds to believe that we may be behind a
symmetric NAT. */
boolean maybeSymmetric;
private boolean hasDetectedPM;
@@ -67,11 +65,7 @@
ipDetectorManager = new IPDetectorPluginManager(node, this);
ipDetector = new IPAddressDetector(10*1000, this);
primaryIPUndetectedAlert = new IPUndetectedUserAlert(node);
- arkPutter = new NodeARKInserter(node, this, false);
- if(node.myOldARK != null)
- oldARKPutter = new NodeARKInserter(node, this, true);
- else
- oldARKPutter = null;
+ arkPutter = new NodeARKInserter(node, this);
}
/**
@@ -281,8 +275,6 @@
}
redetectAddress();
arkPutter.update();
- if(oldARKPutter != null)
- oldARKPutter.update();
}
public void redetectAddress() {
@@ -292,8 +284,6 @@
lastIP = newIP;
}
arkPutter.update();
- if(oldARKPutter != null)
- oldARKPutter.update();
node.writeNodeFile();
}
@@ -419,7 +409,6 @@
ticker.queueTimedJob(new FastRunnable() {
public void run() {
arkPutter.start();
- if(oldARKPutter != null) oldARKPutter.start();
}
}, 60*1000);
}
