Changeset 0c76201 for router


Ignore:
Timestamp:
Dec 16, 2016 5:45:54 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
328f544
Parents:
b78b3cb (diff), 0a1cd20 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

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

to branch 'i2p.i2p' (head 763f037865b6bc798d2db144dc39faa02a09219a)

Location:
router/java/src/net/i2p/router
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/RouterVersion.java

    rb78b3cb r0c76201  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 13;
     21    public final static long BUILD = 0;
    2222
    2323    /** for example "-test" */
    24     public final static String EXTRA = "-rc";
     24    public final static String EXTRA = "";
    2525    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
    2626    public static void main(String args[]) {
  • router/java/src/net/i2p/router/crypto/FamilyKeyCrypto.java

    rb78b3cb r0c76201  
    6363    // Note that we can't use RSA here, as the b64 sig would exceed the 255 char limit for a Mapping
    6464    // Note that we can't use EdDSA here, as keystore doesn't know how, and encoding/decoding is unimplemented
    65     //private static final String DEFAULT_KEY_ALGORITHM = SigType.ECDSA_SHA256_P256.isAvailable() ? "EC" : "DSA";
    66     //private static final int DEFAULT_KEY_SIZE = SigType.ECDSA_SHA256_P256.isAvailable() ? 256 : 1024;
    67     private static final String DEFAULT_KEY_ALGORITHM = "EdDSA";
    68     private static final int DEFAULT_KEY_SIZE = 256;
     65    private static final String DEFAULT_KEY_ALGORITHM = SigType.ECDSA_SHA256_P256.isAvailable() ? "EC" : "DSA";
     66    private static final int DEFAULT_KEY_SIZE = SigType.ECDSA_SHA256_P256.isAvailable() ? 256 : 1024;
     67    //private static final String DEFAULT_KEY_ALGORITHM = "EdDSA";
     68    //private static final int DEFAULT_KEY_SIZE = 256;
    6969    private static final String KS_DIR = "keystore";
    7070    private static final String CERT_DIR = "certificates/family";
  • router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

    rb78b3cb r0c76201  
    117117        "https://netdb.i2p2.no/"              + ',' +   // meeh_at_mail.i2p.crt      // netdb.i2p2.no.crt          // SNI required
    118118        "https://us.reseed.i2p2.no:444/"      + ',' +   // meeh_at_mail.i2p.crt      // us.reseed.i2p2.no.crt
    119         "https://uk.reseed.i2p2.no:444/"      + ',' +   // meeh_at_mail.i2p.crt      // uk.reseed.i2p2.no.crt
     119        //"https://uk.reseed.i2p2.no:444/"      + ',' +   // meeh_at_mail.i2p.crt      // uk.reseed.i2p2.no.crt
    120120        "https://reseed.i2p-projekt.de/";               // echelon_at_mail.i2p.crt   // reseed.i2p-projekt.de.crt
    121121
Note: See TracChangeset for help on using the changeset viewer.