From 7fe9d590f5b60657d2eba2de875f0c94d8702bea Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 28 Dec 2007 20:27:16 +0000 Subject: [PATCH] 2007-12-28 zzz * Add zzz's update signing key --- core/java/src/net/i2p/crypto/TrustedUpdate.java | 7 +++++++ history.txt | 5 ++++- router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java index 9c8f1ac7f..e28bb0473 100644 --- a/core/java/src/net/i2p/crypto/TrustedUpdate.java +++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java @@ -60,6 +60,12 @@ jP69nPbh4KLGhF+SD0+0bW4= =npPe -----END PGP SIGNATURE----- */ + /* zzz's key */ + private static final String DEFAULT_TRUSTED_KEY2 = + "lT54eq3SH0TWWwQ1wgH6XPelIno7wH7UfiZOpQg-ZuxdNhc4UjjrohKdK" + + "Zqfswt1ANPnmOlMewLGBESl7kJB9c5sByz~IOlNyz5BMLRC~R~ZC9QI4W" + + "XwUBYW8BhYO2mkvtdOrcy690lDkwzdf5xLxlCBpQlTaLYzQVjVWBcvbCA="; + private static final String VALID_VERSION_CHARS = "0123456789."; private static final int VERSION_BYTES = 16; private static final int HEADER_BYTES = Signature.SIGNATURE_BYTES + VERSION_BYTES; @@ -99,6 +105,7 @@ jP69nPbh4KLGhF+SD0+0bW4= } else { _trustedKeys.add(DEFAULT_TRUSTED_KEY); + _trustedKeys.add(DEFAULT_TRUSTED_KEY2); } if (_log.shouldLog(Log.DEBUG)) _log.debug("TrustedUpdate created, trusting " + _trustedKeys.size() + " keys."); diff --git a/history.txt b/history.txt index 3d1c843ac..17fd18418 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,7 @@ -$Id: history.txt,v 1.603 2007-12-26 03:14:54 complication Exp $ +$Id: history.txt,v 1.604 2007-12-26 15:55:07 complication Exp $ + +2007-12-28 zzz + * Add zzz's update signing key 2007-12-26 Complication * Improve reseed handler (less repetitive code, diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index b7ca43baf..5a86a809b 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -15,9 +15,9 @@ import net.i2p.CoreVersion; * */ public class RouterVersion { - public final static String ID = "$Revision: 1.538 $ $Date: 2007-12-26 03:14:59 $"; + public final static String ID = "$Revision: 1.539 $ $Date: 2007-12-26 15:55:08 $"; public final static String VERSION = "0.6.1.30"; - public final static long BUILD = 10; + public final static long BUILD = 11; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID);