zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

propagate from branch 'i2p.i2p.zzz.test2' (head 2447f30ec8d46502041197c3ca0ce85d4da070b0)

Browse Source 
to branch 'i2p.i2p' (head 763f037865b6bc798d2db144dc39faa02a09219a)
This commit is contained in:
zzz
2016-12-16 17:45:54 +00:00
parent b78b3cb942 0a1cd20585
commit 0c76201bd9
41 changed files with 23959 additions and 34886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 13;
public final static long BUILD = 0;
/** for example "-test" */
public final static String EXTRA = "-rc";
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);

8
router/java/src/net/i2p/router/crypto/FamilyKeyCrypto.java
View File

@@ -62,10 +62,10 @@ public class FamilyKeyCrypto {
private static final int DEFAULT_KEY_VALID_DAYS = 3652; // 10 years
// Note that we can't use RSA here, as the b64 sig would exceed the 255 char limit for a Mapping
// Note that we can't use EdDSA here, as keystore doesn't know how, and encoding/decoding is unimplemented
//private static final String DEFAULT_KEY_ALGORITHM = SigType.ECDSA_SHA256_P256.isAvailable() ? "EC" : "DSA";
//private static final int DEFAULT_KEY_SIZE = SigType.ECDSA_SHA256_P256.isAvailable() ? 256 : 1024;
private static final String DEFAULT_KEY_ALGORITHM = "EdDSA";
private static final int DEFAULT_KEY_SIZE = 256;
private static final String DEFAULT_KEY_ALGORITHM = SigType.ECDSA_SHA256_P256.isAvailable() ? "EC" : "DSA";
private static final int DEFAULT_KEY_SIZE = SigType.ECDSA_SHA256_P256.isAvailable() ? 256 : 1024;
//private static final String DEFAULT_KEY_ALGORITHM = "EdDSA";
//private static final int DEFAULT_KEY_SIZE = 256;
private static final String KS_DIR = "keystore";
private static final String CERT_DIR = "certificates/family";
private static final String CRL_DIR = "crls";

2
router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java
View File

@@ -116,7 +116,7 @@ public class Reseeder {
"https://download.xxlspeed.com/" + ',' + // backup_at_mail.i2p.crt // download.xxlspeed.com.crt // SNI required
"https://netdb.i2p2.no/" + ',' + // meeh_at_mail.i2p.crt // netdb.i2p2.no.crt // SNI required
"https://us.reseed.i2p2.no:444/" + ',' + // meeh_at_mail.i2p.crt // us.reseed.i2p2.no.crt
"https://uk.reseed.i2p2.no:444/" + ',' + // meeh_at_mail.i2p.crt // uk.reseed.i2p2.no.crt
//"https://uk.reseed.i2p2.no:444/" + ',' + // meeh_at_mail.i2p.crt // uk.reseed.i2p2.no.crt
"https://reseed.i2p-projekt.de/"; // echelon_at_mail.i2p.crt // reseed.i2p-projekt.de.crt
private static final String SU3_FILENAME = "i2pseeds.su3";