Changeset 74cd5ce for router


Ignore:
Timestamp:
Dec 5, 2016 1:41:51 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
8a3a7257
Parents:
f461d48
Message:

Router: Revert default family sig type back to ECDSA,
as the OIDs are changing, to be deferred to next release.
Update blocklist

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

Legend:

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

    rf461d48 r74cd5ce  
    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 = 14;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/crypto/FamilyKeyCrypto.java

    rf461d48 r74cd5ce  
    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";
Note: See TracChangeset for help on using the changeset viewer.