Author: juiceman
Date: 2007-09-09 21:19:34 +0000 (Sun, 09 Sep 2007)
New Revision: 15095
Modified:
trunk/freenet/src/freenet/keys/Key.java
trunk/freenet/src/freenet/node/NodeClientCore.java
Log:
Begin removal of back-compatible code
Modified: trunk/freenet/src/freenet/keys/Key.java
===================================================================
--- trunk/freenet/src/freenet/keys/Key.java 2007-09-09 21:07:46 UTC (rev
15094)
+++ trunk/freenet/src/freenet/keys/Key.java 2007-09-09 21:19:34 UTC (rev
15095)
@@ -42,8 +42,8 @@
* FIXME: REMOVE!! */
static final byte ALGO_INSECURE_AES_PCFB_256_SHA256 = 1;
- public static boolean ALLOW_INSECURE_CLIENT_CHKS;
- public static boolean ALLOW_INSECURE_CLIENT_SSKS;
+ public static boolean ALLOW_INSECURE_CLIENT_CHKS = false;
+ public static boolean ALLOW_INSECURE_CLIENT_SSKS = false;
protected Key(byte[] routingKey) {
this.routingKey = routingKey;
Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java 2007-09-09 21:07:46 UTC
(rev 15094)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java 2007-09-09 21:19:34 UTC
(rev 15095)
@@ -327,40 +327,6 @@
maxBackgroundUSKFetchers =
nodeConfig.getInt("maxBackgroundUSKFetchers");
- // FIXME remove and remove related code when we can just block
them.
- // REDFLAG normally we wouldn't use static variables to carry
important non-final data, but in this
- // case it's temporary code which will be removed before 0.7.0.
-
- //nodeConfig.register("allowInsecureCHKs", false, sortOrder++,
true, false, "NodeClientCore.allowInsecureCHK",
"NodeClientCore.allowInsecureCHKLong",
- // new BooleanCallback() {
-
- // public boolean get() {
- // return
Key.ALLOW_INSECURE_CLIENT_CHKS;
- // }
-
- // public void set(boolean val) throws
InvalidConfigValueException {
- // Key.ALLOW_INSECURE_CLIENT_CHKS
= val;
- // }
- //
- //});
-
- Key.ALLOW_INSECURE_CLIENT_CHKS = false;
-
- //nodeConfig.register("allowInsecureSSKs", false, sortOrder++,
true, false, "NodeClientCore.allowInsecureSSK",
"NodeClientCore.allowInsecureSSKLong",
- // new BooleanCallback() {
-
- // public boolean get() {
- // return
Key.ALLOW_INSECURE_CLIENT_SSKS;
- // }
-
- // public void set(boolean val) throws
InvalidConfigValueException {
- // Key.ALLOW_INSECURE_CLIENT_SSKS
= val;
- // }
- //
- //});
-
- Key.ALLOW_INSECURE_CLIENT_SSKS = false;
-
// This is all part of construction, not of start().
// Some plugins depend on it, so it needs to be *created*
before they are started.
