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

SigUtil: Catch EdDSA IAE

Browse Source 
SU3File: Hide EdDSA and unavailable sig types from help text
This commit is contained in:
zzz
2014-05-05 19:49:24 +00:00
parent 97c1ba2d02
commit 91408cbdce
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -515,6 +515,10 @@ public class SU3File {
StringBuilder buf = new StringBuilder(256); StringBuilder buf = new StringBuilder(256);
buf.append("Available signature types:\n"); buf.append("Available signature types:\n");
for (SigType t : EnumSet.allOf(SigType.class)) { for (SigType t : EnumSet.allOf(SigType.class)) {
if (!t.isAvailable())
continue;
if (t == SigType.EdDSA_SHA512_25519)
continue; // not supported by keytool, and does double hashing right now
buf.append(" ").append(t).append("\t(code: ").append(t.getCode()).append(')'); buf.append(" ").append(t).append("\t(code: ").append(t.getCode()).append(')');
if (t.getCode() == DEFAULT_SIG_CODE) if (t.getCode() == DEFAULT_SIG_CODE)
buf.append(" DEFAULT"); buf.append(" DEFAULT");

12
core/java/src/net/i2p/crypto/SigUtil.java
View File

@@ -248,14 +248,22 @@ public class SigUtil {
private static EdDSAPublicKey cvtToJavaEdDSAKey(SigningPublicKey pk) private static EdDSAPublicKey cvtToJavaEdDSAKey(SigningPublicKey pk)
throws GeneralSecurityException { throws GeneralSecurityException {
return new EdDSAPublicKey(new EdDSAPublicKeySpec( try {
return new EdDSAPublicKey(new EdDSAPublicKeySpec(
pk.getData(), (EdDSAParameterSpec) pk.getType().getParams())); pk.getData(), (EdDSAParameterSpec) pk.getType().getParams()));
} catch (IllegalArgumentException iae) {
throw new InvalidKeyException(iae);
}
} }
private static EdDSAPrivateKey cvtToJavaEdDSAKey(SigningPrivateKey pk) private static EdDSAPrivateKey cvtToJavaEdDSAKey(SigningPrivateKey pk)
throws GeneralSecurityException { throws GeneralSecurityException {
return new EdDSAPrivateKey(new EdDSAPrivateKeySpec( try {
return new EdDSAPrivateKey(new EdDSAPrivateKeySpec(
pk.getData(), (EdDSAParameterSpec) pk.getType().getParams())); pk.getData(), (EdDSAParameterSpec) pk.getType().getParams()));
} catch (IllegalArgumentException iae) {
throw new InvalidKeyException(iae);
}
} }
public static SigningPublicKey fromJavaKey(EdDSAPublicKey pk, SigType type) public static SigningPublicKey fromJavaKey(EdDSAPublicKey pk, SigType type)