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

Fix console SSL excluded ciphers (thx lazyg)

Browse Source 
Fix typo in local address in I2PSSLSocketFactory
Another findbugs char encoding fix
Add keystore password option to SU3File command line
This commit is contained in:
zzz
2015-08-02 12:58:00 +00:00
parent 44b35f328b
commit ecd0231cd0
5 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
View File

@ -465,7 +465,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
else else
_ignorePathMap = null; _ignorePathMap = null;
_writer = new OutputStreamWriter(_out); _writer = new OutputStreamWriter(_out, "UTF-8");
_buffers = new ArrayList<Utf8StringBuilder>(); _buffers = new ArrayList<Utf8StringBuilder>();
_copy = new char[1024]; _copy = new char[1024];
super.doStart(); super.doStart();

2
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@ -517,7 +517,7 @@ public class RouterConsoleRunner implements RouterApp {
sslFactory.setKeyManagerPassword(_context.getProperty(PROP_KEY_PASSWORD, "thisWontWork")); sslFactory.setKeyManagerPassword(_context.getProperty(PROP_KEY_PASSWORD, "thisWontWork"));
sslFactory.addExcludeProtocols(I2PSSLSocketFactory.EXCLUDE_PROTOCOLS.toArray( sslFactory.addExcludeProtocols(I2PSSLSocketFactory.EXCLUDE_PROTOCOLS.toArray(
new String[I2PSSLSocketFactory.EXCLUDE_PROTOCOLS.size()])); new String[I2PSSLSocketFactory.EXCLUDE_PROTOCOLS.size()]));
sslFactory.addExcludeCipherSuites(I2PSSLSocketFactory.INCLUDE_CIPHERS.toArray( sslFactory.addExcludeCipherSuites(I2PSSLSocketFactory.EXCLUDE_CIPHERS.toArray(
new String[I2PSSLSocketFactory.EXCLUDE_CIPHERS.size()])); new String[I2PSSLSocketFactory.EXCLUDE_CIPHERS.size()]));
StringTokenizer tok = new StringTokenizer(_sslListenHost, " ,"); StringTokenizer tok = new StringTokenizer(_sslListenHost, " ,");
while (tok.hasMoreTokens()) { while (tok.hasMoreTokens()) {

49
core/java/src/net/i2p/crypto/SU3File.java
View File

@ -540,9 +540,10 @@ public class SU3File {
String ctype = null; String ctype = null;
String ftype = null; String ftype = null;
String kfile = null; String kfile = null;
String kspass = KeyStoreUtil.DEFAULT_KEYSTORE_PASSWORD;
boolean error = false; boolean error = false;
boolean shouldVerify = true; boolean shouldVerify = true;
Getopt g = new Getopt("SU3File", args, "t:c:f:k:x"); Getopt g = new Getopt("SU3File", args, "t:c:f:k:xp:");
int c; int c;
while ((c = g.getopt()) != -1) { while ((c = g.getopt()) != -1) {
switch (c) { switch (c) {
@ -566,6 +567,10 @@ public class SU3File {
shouldVerify = false; shouldVerify = false;
break; break;
case 'p':
kspass = g.getOptarg();
break;
case '?': case '?':
case ':': case ':':
default: default:
@ -586,16 +591,16 @@ public class SU3File {
Properties props = new Properties(); Properties props = new Properties();
props.setProperty("prng.bufferSize", "16384"); props.setProperty("prng.bufferSize", "16384");
new I2PAppContext(props); new I2PAppContext(props);
ok = signCLI(stype, ctype, ftype, a.get(0), a.get(1), a.get(2), a.get(3), a.get(4), ""); ok = signCLI(stype, ctype, ftype, a.get(0), a.get(1), a.get(2), a.get(3), a.get(4), "", kspass);
} else if ("bulksign".equals(cmd)) { } else if ("bulksign".equals(cmd)) {
Properties props = new Properties(); Properties props = new Properties();
props.setProperty("prng.bufferSize", "16384"); props.setProperty("prng.bufferSize", "16384");
new I2PAppContext(props); new I2PAppContext(props);
ok = bulkSignCLI(stype, ctype, a.get(0), a.get(1), a.get(2), a.get(3)); ok = bulkSignCLI(stype, ctype, a.get(0), a.get(1), a.get(2), a.get(3), kspass);
} else if ("verifysig".equals(cmd)) { } else if ("verifysig".equals(cmd)) {
ok = verifySigCLI(a.get(0), kfile); ok = verifySigCLI(a.get(0), kfile);
} else if ("keygen".equals(cmd)) { } else if ("keygen".equals(cmd)) {
ok = genKeysCLI(stype, a.get(0), a.get(1), a.get(2)); ok = genKeysCLI(stype, a.get(0), a.get(1), a.get(2), kspass);
} else if ("extract".equals(cmd)) { } else if ("extract".equals(cmd)) {
ok = extractCLI(a.get(0), a.get(1), shouldVerify, kfile); ok = extractCLI(a.get(0), a.get(1), shouldVerify, kfile);
} else { } else {
@ -611,12 +616,13 @@ public class SU3File {
} }
private static final void showUsageCLI() { private static final void showUsageCLI() {
System.err.println("Usage: SU3File keygen [-t type|code] publicKeyFile keystore.ks you@mail.i2p"); System.err.println("Usage: SU3File keygen [-t type|code] [-p keystorepw] publicKeyFile keystore.ks you@mail.i2p\n" +
System.err.println(" SU3File sign [-t type|code] [-c type|code] [-f type|code] inputFile.zip signedFile.su3 keystore.ks version you@mail.i2p"); " SU3File sign [-t type|code] [-c type|code] [-f type|code] [-p keystorepw] inputFile.zip signedFile.su3 keystore.ks version you@mail.i2p\n" +
System.err.println(" SU3File bulksign [-t type|code] [-c type|code] directory keystore.ks version you@mail.i2p"); " SU3File bulksign [-t type|code] [-c type|code] [-p keystorepw] directory keystore.ks version you@mail.i2p\n" +
System.err.println(" SU3File showversion signedFile.su3"); " SU3File showversion signedFile.su3\n" +
System.err.println(" SU3File verifysig [-k file.crt] signedFile.su3 ## -k use this pubkey cert for verification"); " SU3File verifysig [-k file.crt] signedFile.su3 ## -k use this pubkey cert for verification\n" +
System.err.println(" SU3File extract [-x] [-k file.crt] signedFile.su3 outFile ## -x don't check sig"); " SU3File extract [-x] [-k file.crt] signedFile.su3 outFile ## -x don't check sig");
System.err.println("Default keystore password: \"" + KeyStoreUtil.DEFAULT_KEYSTORE_PASSWORD + '"');
System.err.println(dumpTypes()); System.err.println(dumpTypes());
} }
@ -714,7 +720,7 @@ public class SU3File {
* @since 0.9.9 * @since 0.9.9
*/ */
private static final boolean bulkSignCLI(String stype, String ctype, String dir, private static final boolean bulkSignCLI(String stype, String ctype, String dir,
String privateKeyFile, String version, String signerName) { String privateKeyFile, String version, String signerName, String kspass) {
File d = new File(dir); File d = new File(dir);
if (!d.isDirectory()) { if (!d.isDirectory()) {
System.out.println("Directory does not exist: " + d); System.out.println("Directory does not exist: " + d);
@ -749,7 +755,8 @@ public class SU3File {
if (!inputFile.endsWith(".zip")) if (!inputFile.endsWith(".zip"))
continue; continue;
String signedFile = inputFile.substring(0, inputFile.length() - 4) + ".su3"; String signedFile = inputFile.substring(0, inputFile.length() - 4) + ".su3";
boolean rv = signCLI(stype, ctype, null, inputFile, signedFile, privateKeyFile, version, signerName, keypw); boolean rv = signCLI(stype, ctype, null, inputFile, signedFile,
privateKeyFile, version, signerName, keypw, kspass);
if (!rv) if (!rv)
return false; return false;
success++; success++;
@ -764,7 +771,7 @@ public class SU3File {
* @since 0.9.9 * @since 0.9.9
*/ */
private static final boolean signCLI(String stype, String ctype, String ftype, String inputFile, String signedFile, private static final boolean signCLI(String stype, String ctype, String ftype, String inputFile, String signedFile,
String privateKeyFile, String version, String signerName, String keypw) { String privateKeyFile, String version, String signerName, String keypw, String kspass) {
SigType type = stype == null ? SigType.getByCode(Integer.valueOf(DEFAULT_SIG_CODE)) : SigType.parseSigType(stype); SigType type = stype == null ? SigType.getByCode(Integer.valueOf(DEFAULT_SIG_CODE)) : SigType.parseSigType(stype);
if (type == null) { if (type == null) {
System.out.println("Signature type " + stype + " is not supported"); System.out.println("Signature type " + stype + " is not supported");
@ -799,7 +806,7 @@ public class SU3File {
System.out.println("Warning: File type " + ftype + " is undefined"); System.out.println("Warning: File type " + ftype + " is undefined");
} }
} }
return signCLI(type, ct, ft, inputFile, signedFile, privateKeyFile, version, signerName, keypw); return signCLI(type, ct, ft, inputFile, signedFile, privateKeyFile, version, signerName, keypw, kspass);
} }
/** /**
@ -807,7 +814,7 @@ public class SU3File {
* @since 0.9.9 * @since 0.9.9
*/ */
private static final boolean signCLI(SigType type, ContentType ctype, int ftype, String inputFile, String signedFile, private static final boolean signCLI(SigType type, ContentType ctype, int ftype, String inputFile, String signedFile,
String privateKeyFile, String version, String signerName, String keypw) { String privateKeyFile, String version, String signerName, String keypw, String kspass) {
try { try {
while (keypw.length() < 6) { while (keypw.length() < 6) {
System.out.print("Enter password for key \"" + signerName + "\": "); System.out.print("Enter password for key \"" + signerName + "\": ");
@ -821,7 +828,7 @@ public class SU3File {
System.out.println("Key password must be at least 6 characters"); System.out.println("Key password must be at least 6 characters");
} }
File pkfile = new File(privateKeyFile); File pkfile = new File(privateKeyFile);
PrivateKey pk = KeyStoreUtil.getPrivateKey(pkfile,KeyStoreUtil.DEFAULT_KEYSTORE_PASSWORD, signerName, keypw); PrivateKey pk = KeyStoreUtil.getPrivateKey(pkfile, kspass, signerName, keypw);
if (pk == null) { if (pk == null) {
System.out.println("Private key for " + signerName + " not found in keystore " + privateKeyFile); System.out.println("Private key for " + signerName + " not found in keystore " + privateKeyFile);
return false; return false;
@ -895,13 +902,14 @@ public class SU3File {
* @return success * @return success
* @since 0.9.9 * @since 0.9.9
*/ */
private static final boolean genKeysCLI(String stype, String publicKeyFile, String privateKeyFile, String alias) { private static final boolean genKeysCLI(String stype, String publicKeyFile, String privateKeyFile,
String alias, String kspass) {
SigType type = stype == null ? SigType.getByCode(Integer.valueOf(DEFAULT_SIG_CODE)) : SigType.parseSigType(stype); SigType type = stype == null ? SigType.getByCode(Integer.valueOf(DEFAULT_SIG_CODE)) : SigType.parseSigType(stype);
if (type == null) { if (type == null) {
System.out.println("Signature type " + stype + " is not supported"); System.out.println("Signature type " + stype + " is not supported");
return false; return false;
} }
return genKeysCLI(type, publicKeyFile, privateKeyFile, alias); return genKeysCLI(type, publicKeyFile, privateKeyFile, alias, kspass);
} }
/** /**
@ -909,7 +917,8 @@ public class SU3File {
* @return success * @return success
* @since 0.9.9 * @since 0.9.9
*/ */
private static final boolean genKeysCLI(SigType type, String publicKeyFile, String privateKeyFile, String alias) { private static final boolean genKeysCLI(SigType type, String publicKeyFile, String privateKeyFile,
String alias, String kspass) {
File pubFile = new File(publicKeyFile); File pubFile = new File(publicKeyFile);
if (pubFile.exists()) { if (pubFile.exists()) {
System.out.println("Error: Not overwriting file " + publicKeyFile); System.out.println("Error: Not overwriting file " + publicKeyFile);
@ -947,7 +956,7 @@ public class SU3File {
if (keylen == 528) if (keylen == 528)
keylen = 521; keylen = 521;
} }
boolean success = KeyStoreUtil.createKeys(ksFile, KeyStoreUtil.DEFAULT_KEYSTORE_PASSWORD, alias, boolean success = KeyStoreUtil.createKeys(ksFile, kspass, alias,
alias, "I2P", 3652, type.getBaseAlgorithm().getName(), alias, "I2P", 3652, type.getBaseAlgorithm().getName(),
keylen, keypw); keylen, keypw);
if (!success) { if (!success) {

2
core/java/src/net/i2p/util/I2PSSLSocketFactory.java
View File

@ -284,7 +284,7 @@ public class I2PSSLSocketFactory {
host.equals("localhost") || host.equals("localhost") ||
host.equals("127.0.0.1") || host.equals("127.0.0.1") ||
host.equals("::1") || host.equals("::1") ||
host.equals("0:0:0:0:0:0:0::1")) { host.equals("0:0:0:0:0:0:0:1")) {
if (log.shouldWarn()) if (log.shouldWarn())
log.warn("Skipping hostname validation for " + host); log.warn("Skipping hostname validation for " + host);
return; return;

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

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 0; public final static long BUILD = 1;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";