corrected table inclusion - relates to github #2027

Author: dghgit

prov/src/main/java/org/bouncycastle/jcajce/provider/util/SecretKeyUtil.java

@@ -9,13 +9,16 @@
 import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
 import org.bouncycastle.util.Integers;
 
+/**
+ * @deprecated class appears to be no longer in use, maybe getting imported by others though.
+ */
 public class SecretKeyUtil
 {
-    private static Map keySizes = new HashMap();
+    private static Map<ASN1ObjectIdentifier, Integer> keySizes = new HashMap<ASN1ObjectIdentifier, Integer>();
 
     static
     {
-        keySizes.put(PKCSObjectIdentifiers.des_EDE3_CBC.getId(), Integers.valueOf(192));
+        keySizes.put(PKCSObjectIdentifiers.des_EDE3_CBC, Integers.valueOf(192));
 
         keySizes.put(NISTObjectIdentifiers.id_aes128_CBC, Integers.valueOf(128));
         keySizes.put(NISTObjectIdentifiers.id_aes192_CBC, Integers.valueOf(192));

prov/src/test/java/org/bouncycastle/jcajce/provider/test/AllTests.java

@@ -33,6 +33,7 @@ public static Test suite()
         suite.addTestSuite(CompositeSignaturesTest.class);
         suite.addTestSuite(BouncyCastleProviderTest.class);
         suite.addTestSuite(PQCSignatureTest.class);
+        suite.addTestSuite(SecretKeyUtilTest.class);
 
         return new BCTestSetup(suite);
     }

prov/src/test/java/org/bouncycastle/jcajce/provider/test/RandomTest.java

@@ -2,7 +2,6 @@
 
 import java.security.SecureRandom;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
@@ -18,7 +17,7 @@ public void testCheckRandom()
 
         random.nextBytes(rng);
 
-        Assert.assertTrue(checkNonConstant(rng));
+        assertTrue(checkNonConstant(rng));
     }
 
     public void testCheckNonceIVRandom()
@@ -30,7 +29,7 @@ public void testCheckNonceIVRandom()
 
         random.nextBytes(rng);
 
-        Assert.assertTrue(checkNonConstant(rng));
+        assertTrue(checkNonConstant(rng));
     }
 
     private boolean checkNonConstant(byte[] data)

prov/src/test/java/org/bouncycastle/jcajce/provider/test/SecretKeyUtilTest.java

@@ -0,0 +1,24 @@
+package org.bouncycastle.jcajce.provider.test;
+
+import junit.framework.TestCase;
+import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
+import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.bouncycastle.internal.asn1.ntt.NTTObjectIdentifiers;
+import org.bouncycastle.jcajce.provider.util.SecretKeyUtil;
+
+public class SecretKeyUtilTest
+    extends TestCase
+{
+    public void testgetKeySize()
+    {
+        assertEquals(192, SecretKeyUtil.getKeySize(PKCSObjectIdentifiers.des_EDE3_CBC));
+
+        assertEquals(128, SecretKeyUtil.getKeySize(NISTObjectIdentifiers.id_aes128_CBC));
+        assertEquals(192, SecretKeyUtil.getKeySize(NISTObjectIdentifiers.id_aes192_CBC));
+        assertEquals(256, SecretKeyUtil.getKeySize(NISTObjectIdentifiers.id_aes256_CBC));
+
+        assertEquals(128, SecretKeyUtil.getKeySize(NTTObjectIdentifiers.id_camellia128_cbc));
+        assertEquals(192, SecretKeyUtil.getKeySize(NTTObjectIdentifiers.id_camellia192_cbc));
+        assertEquals(256, SecretKeyUtil.getKeySize(NTTObjectIdentifiers.id_camellia256_cbc));
+    }
+}