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

Generalized to support any EdDSA parameter spec

Browse Source
This commit is contained in:
str4d
2014-04-26 11:59:16 +00:00
parent ce397f5858
commit 02c0ddb3d3
2 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/src/net/i2p/crypto/DSAEngine.java
View File

@@ -506,8 +506,8 @@ public class DSAEngine {
return altVerifySigSHA1(signature, data, offset, len, verifyingKey); return altVerifySigSHA1(signature, data, offset, len, verifyingKey);
java.security.Signature jsig; java.security.Signature jsig;
if (type == SigType.EdDSA_SHA512_25519) if (type.getBaseAlgorithm() == SigAlgo.EdDSA)
jsig = new net.i2p.crypto.eddsa.EdDSAEngine(java.security.MessageDigest.getInstance("SHA-512")); jsig = new net.i2p.crypto.eddsa.EdDSAEngine(type.getDigestInstance());
else else
jsig = java.security.Signature.getInstance(type.getAlgorithmName()); jsig = java.security.Signature.getInstance(type.getAlgorithmName());
PublicKey pubKey = SigUtil.toJavaKey(verifyingKey); PublicKey pubKey = SigUtil.toJavaKey(verifyingKey);
@@ -587,8 +587,8 @@ public class DSAEngine {
return altSignSHA1(data, offset, len, privateKey); return altSignSHA1(data, offset, len, privateKey);
java.security.Signature jsig; java.security.Signature jsig;
if (type == SigType.EdDSA_SHA512_25519) if (type.getBaseAlgorithm() == SigAlgo.EdDSA)
jsig = new net.i2p.crypto.eddsa.EdDSAEngine(java.security.MessageDigest.getInstance("SHA-512")); jsig = new net.i2p.crypto.eddsa.EdDSAEngine(type.getDigestInstance());
else else
jsig = java.security.Signature.getInstance(type.getAlgorithmName()); jsig = java.security.Signature.getInstance(type.getAlgorithmName());
PrivateKey privKey = SigUtil.toJavaKey(privateKey); PrivateKey privKey = SigUtil.toJavaKey(privateKey);

6
core/java/src/net/i2p/crypto/KeyGenerator.java
View File

@@ -217,8 +217,10 @@ public class KeyGenerator {
if (type == SigType.DSA_SHA1) if (type == SigType.DSA_SHA1)
return generateSigningKeys(); return generateSigningKeys();
KeyPair kp; KeyPair kp;
if (type == SigType.EdDSA_SHA512_25519) { if (type.getBaseAlgorithm() == SigAlgo.EdDSA) {
kp = new net.i2p.crypto.eddsa.KeyPairGenerator().generateKeyPair(); net.i2p.crypto.eddsa.KeyPairGenerator kpg = new net.i2p.crypto.eddsa.KeyPairGenerator();
kpg.initialize(type.getParams(), _context.random());
kp = kpg.generateKeyPair();
} else { } else {
KeyPairGenerator kpg = KeyPairGenerator.getInstance(type.getBaseAlgorithm().getName()); KeyPairGenerator kpg = KeyPairGenerator.getInstance(type.getBaseAlgorithm().getName());
try { try {