diff --git a/core/java/src/net/i2p/crypto/CertUtil.java b/core/java/src/net/i2p/crypto/CertUtil.java index 0bf354c53a23a71a834599239bb8aaeca84d8796..eef351c03409a9ee65b86a3663f78192dd24ba77 100644 --- a/core/java/src/net/i2p/crypto/CertUtil.java +++ b/core/java/src/net/i2p/crypto/CertUtil.java @@ -1,13 +1,10 @@ package net.i2p.crypto; import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; import java.io.IOException; import java.io.OutputStream; import java.io.PrintWriter; import java.security.GeneralSecurityException; -import java.security.KeyStore; import java.security.cert.Certificate; import java.security.cert.CertificateException; import java.security.cert.CertificateEncodingException; diff --git a/core/java/src/net/i2p/crypto/DSAEngine.java b/core/java/src/net/i2p/crypto/DSAEngine.java index de7a2b553df1c4d7b7db03887e0435202c159a47..5b78da021d5aab2b675598820813ce48514bbe04 100644 --- a/core/java/src/net/i2p/crypto/DSAEngine.java +++ b/core/java/src/net/i2p/crypto/DSAEngine.java @@ -64,7 +64,7 @@ import net.i2p.util.NativeBigInteger; * Params and rv's changed from Hash to SHA1Hash for version 0.8.1 * Hash variants of sign() and verifySignature() restored in 0.8.3, required by Syndie. * - * As of 0.9.9, certain methods support ECDSA keys and signatures, i.e. all types + * As of 0.9.9, certain methods support RSA and ECDSA keys and signatures, i.e. all types * specified in SigType. The type is specified by the getType() method in * Signature, SigningPublicKey, and SigningPrivateKey. See Javadocs for individual * methods for the supported types. Methods encountering an unsupported type diff --git a/core/java/src/net/i2p/crypto/KeyGenerator.java b/core/java/src/net/i2p/crypto/KeyGenerator.java index bdf8c568818a452258a353e8ee600e150f0a2e47..025da6f59281d2a71b3e92b033484ba4a91a44d6 100644 --- a/core/java/src/net/i2p/crypto/KeyGenerator.java +++ b/core/java/src/net/i2p/crypto/KeyGenerator.java @@ -15,9 +15,6 @@ import java.security.InvalidKeyException; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.ProviderException; -import java.security.interfaces.ECPrivateKey; -import java.security.interfaces.ECPublicKey; -import java.security.spec.ECPoint; import net.i2p.I2PAppContext; import net.i2p.data.Hash; diff --git a/core/java/src/net/i2p/crypto/SigUtil.java b/core/java/src/net/i2p/crypto/SigUtil.java index 5e5e03270758380a9de45ea06099e1078dd22969..bae5b0ef39b2889e6ea5964348b2603aafb491eb 100644 --- a/core/java/src/net/i2p/crypto/SigUtil.java +++ b/core/java/src/net/i2p/crypto/SigUtil.java @@ -171,7 +171,7 @@ class SigUtil { return (ECPublicKey) kf.generatePublic(ks); } - public static ECPrivateKey cvtToJavaECKey(SigningPrivateKey pk) + private static ECPrivateKey cvtToJavaECKey(SigningPrivateKey pk) throws GeneralSecurityException { SigType type = pk.getType(); int len = type.getPubkeyLen();