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

Router: Revert default family sig type back to ECDSA,

Browse Source 
as the OIDs are changing, to be deferred to next release.
Update blocklist
This commit is contained in:
zzz
2016-12-05 13:41:51 +00:00
parent f461d4881d
commit 74cd5cee20
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
history.txt
View File

@ -1,3 +1,12 @@
2016-12-05 zzz
* Router:
- Revert default family sig type back to ECDSA
- Update blocklist
2016-12-02 zzz
* Cleanup: Single char indexOf()
* Console: Version the css links
2016-12-01 zzz
* NetDb: Peer selection tweaks

14
installer/resources/blocklist.txt
View File

@ -72,3 +72,17 @@ Friend of the Chinese Floodfill Flooder:159.226.40.3
<a href="http://www.team-cymru.org/Services/Bogons/http.html">The Team Cymru Bogon List v6.8 03 FEB 2011</a>:198.51.100.0/24
<a href="http://www.team-cymru.org/Services/Bogons/http.html">The Team Cymru Bogon List v6.8 03 FEB 2011</a>:203.0.113.0/24
<a href="http://www.team-cymru.org/Services/Bogons/http.html">The Team Cymru Bogon List v6.8 03 FEB 2011</a>:224.0.0.0/3
Sybil:45.32.60.71
Sybil:45.76.129.193
Sybil:47.88.6.66
Sybil:47.88.7.8
Sybil:47.88.136.46
Sybil:47.88.136.86
Sybil:47.88.138.200
Sybil:47.89.38.177
Sybil:47.90.1.15
Sybil:47.90.1.26
Sybil:150.95.128.165
Sybil:2001;19f0;7001;d99;5400;ff;fe41;829c
Sybil:2001;19f0;7402;24d;5400;ff;fe41;9153
Sybil:2400;8500;1302;816;a150;95;128;165b

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

@ -18,7 +18,7 @@ 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 = 14;
/** for example "-test" */
public final static String EXTRA = "-rc";

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";