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

cache key conversion

Browse Source
This commit is contained in:
zzz
2013-09-08 13:06:30 +00:00
parent 55318cf14b
commit 27936fce04
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/src/net/i2p/crypto/ElGamalEngine.java
View File

@ -81,6 +81,7 @@ public class ElGamalEngine {
*/
public void shutdown() {
_ykgen.shutdown();
SigUtil.clearCaches();
}
/**

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

@ -17,10 +17,12 @@ import java.security.spec.ECPrivateKeySpec;
import java.security.spec.ECPublicKeySpec;
import java.security.spec.ECPoint;
import java.security.spec.EllipticCurve;
import java.util.Map;
import net.i2p.data.Signature;
import net.i2p.data.SigningPrivateKey;
import net.i2p.data.SigningPublicKey;
import net.i2p.util.LHMCache;
/**
@ -30,6 +32,11 @@ import net.i2p.data.SigningPublicKey;
*/
class SigUtil {
private static final Map<SigningPublicKey, ECPublicKey> _pubkeyCache = new LHMCache(64);
private static final Map<SigningPrivateKey, ECPrivateKey> _privkeyCache = new LHMCache(16);
private SigUtil() {}
/**
* @return JAVA key!
*/
@ -74,8 +81,44 @@ class SigUtil {
return fromJavaKey((ECPrivateKey) pk, type);
}
/**
* @return JAVA key!
*/
public static ECPublicKey toJavaECKey(SigningPublicKey pk)
throws GeneralSecurityException {
ECPublicKey rv;
synchronized (_pubkeyCache) {
rv = _pubkeyCache.get(pk);
}
if (rv != null)
return rv;
rv = cvtToJavaECKey(pk);
synchronized (_pubkeyCache) {
_pubkeyCache.put(pk, rv);
}
return rv;
}
/**
* @return JAVA key!
*/
public static ECPrivateKey toJavaECKey(SigningPrivateKey pk)
throws GeneralSecurityException {
ECPrivateKey rv;
synchronized (_privkeyCache) {
rv = _privkeyCache.get(pk);
}
if (rv != null)
return rv;
rv = cvtToJavaECKey(pk);
synchronized (_privkeyCache) {
_privkeyCache.put(pk, rv);
}
return rv;
}
private static ECPublicKey cvtToJavaECKey(SigningPublicKey pk)
throws GeneralSecurityException {
SigType type = pk.getType();
int len = type.getPubkeyLen();
int sublen = len / 2;
@ -93,7 +136,7 @@ class SigUtil {
return (ECPublicKey) kf.generatePublic(ks);
}
public static ECPrivateKey toJavaECKey(SigningPrivateKey pk)
public static ECPrivateKey cvtToJavaECKey(SigningPrivateKey pk)
throws GeneralSecurityException {
SigType type = pk.getType();
int len = type.getPubkeyLen();
@ -290,4 +333,12 @@ class SigUtil {
return rv;
}
public static void clearCaches() {
synchronized(_pubkeyCache) {
_pubkeyCache.clear();
}
synchronized(_privkeyCache) {
_privkeyCache.clear();
}
}
}