From ad2561125ebeb58c8d0aa7aaf0e21fc28c615a70 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 24 Jan 2016 16:37:21 +0000 Subject: [PATCH] final all the crypto classes --- core/java/src/net/i2p/crypto/CertUtil.java | 2 +- core/java/src/net/i2p/crypto/CryptixAESEngine.java | 2 +- core/java/src/net/i2p/crypto/CryptoConstants.java | 2 +- core/java/src/net/i2p/crypto/DSAEngine.java | 2 +- core/java/src/net/i2p/crypto/ECConstants.java | 2 +- core/java/src/net/i2p/crypto/ECUtil.java | 2 +- core/java/src/net/i2p/crypto/ElGamalAESEngine.java | 2 +- core/java/src/net/i2p/crypto/ElGamalEngine.java | 2 +- core/java/src/net/i2p/crypto/HMAC256Generator.java | 2 +- core/java/src/net/i2p/crypto/KeyGenerator.java | 2 +- core/java/src/net/i2p/crypto/KeyStoreUtil.java | 2 +- core/java/src/net/i2p/crypto/RSAConstants.java | 2 +- core/java/src/net/i2p/crypto/SigUtil.java | 2 +- core/java/src/net/i2p/crypto/YKGenerator.java | 2 +- core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java | 2 +- core/java/src/net/i2p/crypto/eddsa/KeyFactory.java | 2 +- core/java/src/net/i2p/crypto/eddsa/KeyPairGenerator.java | 2 +- core/java/src/net/i2p/crypto/elgamal/KeyFactory.java | 2 +- core/java/src/net/i2p/crypto/elgamal/KeyPairGenerator.java | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/core/java/src/net/i2p/crypto/CertUtil.java b/core/java/src/net/i2p/crypto/CertUtil.java index dac0160de..fcd402d21 100644 --- a/core/java/src/net/i2p/crypto/CertUtil.java +++ b/core/java/src/net/i2p/crypto/CertUtil.java @@ -41,7 +41,7 @@ import net.i2p.util.SystemVersion; * * @since 0.9.9 */ -public class CertUtil { +public final class CertUtil { private static final int LINE_LENGTH = 64; diff --git a/core/java/src/net/i2p/crypto/CryptixAESEngine.java b/core/java/src/net/i2p/crypto/CryptixAESEngine.java index e5cf7cb92..61b5386de 100644 --- a/core/java/src/net/i2p/crypto/CryptixAESEngine.java +++ b/core/java/src/net/i2p/crypto/CryptixAESEngine.java @@ -36,7 +36,7 @@ import net.i2p.util.SystemVersion; * * @author jrandom, thecrypto */ -public class CryptixAESEngine extends AESEngine { +public final class CryptixAESEngine extends AESEngine { private final static CryptixRijndael_Algorithm _algo = new CryptixRijndael_Algorithm(); // keys are now cached in the SessionKey objects //private CryptixAESKeyCache _cache; diff --git a/core/java/src/net/i2p/crypto/CryptoConstants.java b/core/java/src/net/i2p/crypto/CryptoConstants.java index 52422a793..00994d210 100644 --- a/core/java/src/net/i2p/crypto/CryptoConstants.java +++ b/core/java/src/net/i2p/crypto/CryptoConstants.java @@ -44,7 +44,7 @@ import net.i2p.util.NativeBigInteger; * See also: ECConstants, RSAConstants * */ -public class CryptoConstants { +public final class CryptoConstants { public static final BigInteger dsap = new NativeBigInteger( "9c05b2aa960d9b97b8931963c9cc9e8c3026e9b8ed92fad0a69cc886d5bf8015fcadae31" + "a0ad18fab3f01b00a358de237655c4964afaa2b337e96ad316b9fb1cc564b5aec5b69a9f" diff --git a/core/java/src/net/i2p/crypto/DSAEngine.java b/core/java/src/net/i2p/crypto/DSAEngine.java index 803ed6a64..4fb9cb20e 100644 --- a/core/java/src/net/i2p/crypto/DSAEngine.java +++ b/core/java/src/net/i2p/crypto/DSAEngine.java @@ -72,7 +72,7 @@ import net.i2p.util.NativeBigInteger; * * EdDSA support added in 0.9.15 */ -public class DSAEngine { +public final class DSAEngine { private final Log _log; private final I2PAppContext _context; diff --git a/core/java/src/net/i2p/crypto/ECConstants.java b/core/java/src/net/i2p/crypto/ECConstants.java index 8bca0b0ac..2518e34f9 100644 --- a/core/java/src/net/i2p/crypto/ECConstants.java +++ b/core/java/src/net/i2p/crypto/ECConstants.java @@ -20,7 +20,7 @@ import net.i2p.util.NativeBigInteger; * * @since 0.9.9 */ -class ECConstants { +final class ECConstants { private static final boolean DEBUG = false; diff --git a/core/java/src/net/i2p/crypto/ECUtil.java b/core/java/src/net/i2p/crypto/ECUtil.java index 8d2228480..03fd77e0b 100644 --- a/core/java/src/net/i2p/crypto/ECUtil.java +++ b/core/java/src/net/i2p/crypto/ECUtil.java @@ -19,7 +19,7 @@ import net.i2p.util.NativeBigInteger; * * @since 0.9.16 */ -class ECUtil { +final class ECUtil { private static final BigInteger TWO = new BigInteger("2"); private static final BigInteger THREE = new BigInteger("3"); diff --git a/core/java/src/net/i2p/crypto/ElGamalAESEngine.java b/core/java/src/net/i2p/crypto/ElGamalAESEngine.java index 0fe652bb2..6f0c87ab3 100644 --- a/core/java/src/net/i2p/crypto/ElGamalAESEngine.java +++ b/core/java/src/net/i2p/crypto/ElGamalAESEngine.java @@ -32,7 +32,7 @@ import net.i2p.util.SimpleByteCache; * * No, this does not extend AESEngine or CryptixAESEngine. */ -public class ElGamalAESEngine { +public final class ElGamalAESEngine { private final Log _log; private final static int MIN_ENCRYPTED_SIZE = 80; // smallest possible resulting size private final I2PAppContext _context; diff --git a/core/java/src/net/i2p/crypto/ElGamalEngine.java b/core/java/src/net/i2p/crypto/ElGamalEngine.java index a80e0a99e..9e25e8ad4 100644 --- a/core/java/src/net/i2p/crypto/ElGamalEngine.java +++ b/core/java/src/net/i2p/crypto/ElGamalEngine.java @@ -52,7 +52,7 @@ import net.i2p.util.SimpleByteCache; * @author thecrypto, jrandom */ -public class ElGamalEngine { +public final class ElGamalEngine { private final Log _log; private final I2PAppContext _context; private final YKGenerator _ykgen; diff --git a/core/java/src/net/i2p/crypto/HMAC256Generator.java b/core/java/src/net/i2p/crypto/HMAC256Generator.java index 688e3148d..bb5b62d15 100644 --- a/core/java/src/net/i2p/crypto/HMAC256Generator.java +++ b/core/java/src/net/i2p/crypto/HMAC256Generator.java @@ -21,7 +21,7 @@ import org.bouncycastle.oldcrypto.macs.I2PHMac; * * Deprecated, used only by Syndie. */ -public class HMAC256Generator extends HMACGenerator { +public final class HMAC256Generator extends HMACGenerator { /** * @param context unused diff --git a/core/java/src/net/i2p/crypto/KeyGenerator.java b/core/java/src/net/i2p/crypto/KeyGenerator.java index efe9bacac..6c8b7ec48 100644 --- a/core/java/src/net/i2p/crypto/KeyGenerator.java +++ b/core/java/src/net/i2p/crypto/KeyGenerator.java @@ -55,7 +55,7 @@ import net.i2p.util.RandomSource; /** Define a way of generating asymmetrical key pairs as well as symmetrical keys * @author jrandom */ -public class KeyGenerator { +public final class KeyGenerator { private final I2PAppContext _context; public KeyGenerator(I2PAppContext context) { diff --git a/core/java/src/net/i2p/crypto/KeyStoreUtil.java b/core/java/src/net/i2p/crypto/KeyStoreUtil.java index b4f21767a..40e597b93 100644 --- a/core/java/src/net/i2p/crypto/KeyStoreUtil.java +++ b/core/java/src/net/i2p/crypto/KeyStoreUtil.java @@ -33,7 +33,7 @@ import net.i2p.util.SystemVersion; * * @since 0.9.9 */ -public class KeyStoreUtil { +public final class KeyStoreUtil { public static boolean _blacklistLogged; diff --git a/core/java/src/net/i2p/crypto/RSAConstants.java b/core/java/src/net/i2p/crypto/RSAConstants.java index 3f77d09f1..c6e0234dc 100644 --- a/core/java/src/net/i2p/crypto/RSAConstants.java +++ b/core/java/src/net/i2p/crypto/RSAConstants.java @@ -10,7 +10,7 @@ import net.i2p.util.NativeBigInteger; * * @since 0.9.9 */ -class RSAConstants { +final class RSAConstants { /** * Generate a spec diff --git a/core/java/src/net/i2p/crypto/SigUtil.java b/core/java/src/net/i2p/crypto/SigUtil.java index 715c58472..119811802 100644 --- a/core/java/src/net/i2p/crypto/SigUtil.java +++ b/core/java/src/net/i2p/crypto/SigUtil.java @@ -50,7 +50,7 @@ import net.i2p.util.NativeBigInteger; * * @since 0.9.9, public since 0.9.12 */ -public class SigUtil { +public final class SigUtil { private static final Map _ECPubkeyCache = new LHMCache(64); private static final Map _ECPrivkeyCache = new LHMCache(16); diff --git a/core/java/src/net/i2p/crypto/YKGenerator.java b/core/java/src/net/i2p/crypto/YKGenerator.java index 30245c229..7a69eee36 100644 --- a/core/java/src/net/i2p/crypto/YKGenerator.java +++ b/core/java/src/net/i2p/crypto/YKGenerator.java @@ -35,7 +35,7 @@ import net.i2p.util.SystemVersion; * * @author jrandom */ -class YKGenerator { +final class YKGenerator { //private final static Log _log = new Log(YKGenerator.class); private final int MIN_NUM_BUILDERS; private final int MAX_NUM_BUILDERS; diff --git a/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java b/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java index 6cf9b4d85..958e4a2dd 100644 --- a/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java +++ b/core/java/src/net/i2p/crypto/eddsa/EdDSAEngine.java @@ -20,7 +20,7 @@ import net.i2p.crypto.eddsa.math.ScalarOps; * @author str4d * */ -public class EdDSAEngine extends Signature { +public final class EdDSAEngine extends Signature { private MessageDigest digest; private final ByteArrayOutputStream baos; private EdDSAKey key; diff --git a/core/java/src/net/i2p/crypto/eddsa/KeyFactory.java b/core/java/src/net/i2p/crypto/eddsa/KeyFactory.java index 642ca2daf..47f854249 100644 --- a/core/java/src/net/i2p/crypto/eddsa/KeyFactory.java +++ b/core/java/src/net/i2p/crypto/eddsa/KeyFactory.java @@ -18,7 +18,7 @@ import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec; * @author str4d * */ -public class KeyFactory extends KeyFactorySpi { +public final class KeyFactory extends KeyFactorySpi { /** * As of 0.9.25, supports PKCS8EncodedKeySpec diff --git a/core/java/src/net/i2p/crypto/eddsa/KeyPairGenerator.java b/core/java/src/net/i2p/crypto/eddsa/KeyPairGenerator.java index 1de1f5b24..6fd13d865 100644 --- a/core/java/src/net/i2p/crypto/eddsa/KeyPairGenerator.java +++ b/core/java/src/net/i2p/crypto/eddsa/KeyPairGenerator.java @@ -21,7 +21,7 @@ import net.i2p.util.RandomSource; * * @since 0.9.15 */ -public class KeyPairGenerator extends KeyPairGeneratorSpi { +public final class KeyPairGenerator extends KeyPairGeneratorSpi { private static final int DEFAULT_STRENGTH = 256; private EdDSAParameterSpec edParams; private SecureRandom random; diff --git a/core/java/src/net/i2p/crypto/elgamal/KeyFactory.java b/core/java/src/net/i2p/crypto/elgamal/KeyFactory.java index 088c1ed40..7c7809fb4 100644 --- a/core/java/src/net/i2p/crypto/elgamal/KeyFactory.java +++ b/core/java/src/net/i2p/crypto/elgamal/KeyFactory.java @@ -25,7 +25,7 @@ import net.i2p.crypto.elgamal.spec.ElGamalPublicKeySpec; * * @since 0.9.25 */ -public class KeyFactory extends KeyFactorySpi { +public final class KeyFactory extends KeyFactorySpi { /** * Supports PKCS8EncodedKeySpec diff --git a/core/java/src/net/i2p/crypto/elgamal/KeyPairGenerator.java b/core/java/src/net/i2p/crypto/elgamal/KeyPairGenerator.java index 46f0edcb4..0819c8a6b 100644 --- a/core/java/src/net/i2p/crypto/elgamal/KeyPairGenerator.java +++ b/core/java/src/net/i2p/crypto/elgamal/KeyPairGenerator.java @@ -27,7 +27,7 @@ import net.i2p.util.RandomSource; * * @since 0.9.25 */ -public class KeyPairGenerator extends KeyPairGeneratorSpi { +public final class KeyPairGenerator extends KeyPairGeneratorSpi { // always long, don't use short key private static final int DEFAULT_STRENGTH = 2048; private ElGamalParameterSpec elgParams;