WolfSSL
/
wolfcrypt-jni
mirror of https://github.com/wolfSSL/wolfcrypt-jni.git
1
0
Fork 0
Code Issues Releases Wiki Activity

JCE: reduce creation of new SecureRandom objects in WolfJCE test cases

pull/53/head
Chris Conlon 2023-08-07 11:33:21 -06:00
parent 79bed5d9d3
commit b9003b5c7d
3 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/java/com/wolfssl/provider/jce/test/WolfCryptCipherTest.java
View File

@ -83,6 +83,9 @@ public class WolfCryptCipherTest {
private static HashMap<String, Integer> expectedBlockSizes = private static HashMap<String, Integer> expectedBlockSizes =
new HashMap<String, Integer>(); new HashMap<String, Integer>();
/* One static SecureRandom to share */
private static SecureRandom secureRandom = new SecureRandom();
@BeforeClass @BeforeClass
public static void testProviderInstallationAtRuntime() public static void testProviderInstallationAtRuntime()
throws NoSuchProviderException, NoSuchPaddingException { throws NoSuchProviderException, NoSuchPaddingException {
@ -1747,7 +1750,7 @@ public class WolfCryptCipherTest {
byte[] plaintext = null; byte[] plaintext = null;
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
keyGen.initialize(2048, new SecureRandom()); keyGen.initialize(2048, secureRandom);
KeyPair pair = keyGen.generateKeyPair(); KeyPair pair = keyGen.generateKeyPair();
PrivateKey priv = pair.getPrivate(); PrivateKey priv = pair.getPrivate();
@ -1805,7 +1808,7 @@ public class WolfCryptCipherTest {
byte[] plaintext = null; byte[] plaintext = null;
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
keyGen.initialize(2048, new SecureRandom()); keyGen.initialize(2048, secureRandom);
KeyPair pair = keyGen.generateKeyPair(); KeyPair pair = keyGen.generateKeyPair();
PrivateKey priv = pair.getPrivate(); PrivateKey priv = pair.getPrivate();
@ -1896,7 +1899,7 @@ public class WolfCryptCipherTest {
byte[] plaintextB = null; byte[] plaintextB = null;
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
keyGen.initialize(2048, new SecureRandom()); keyGen.initialize(2048, secureRandom);
KeyPair pair = keyGen.generateKeyPair(); KeyPair pair = keyGen.generateKeyPair();
PrivateKey priv = pair.getPrivate(); PrivateKey priv = pair.getPrivate();
@ -2012,7 +2015,7 @@ public class WolfCryptCipherTest {
byte[] inputB = new byte[100]; byte[] inputB = new byte[100];
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
keyGen.initialize(2048, new SecureRandom()); keyGen.initialize(2048, secureRandom);
KeyPair pair = keyGen.generateKeyPair(); KeyPair pair = keyGen.generateKeyPair();
PrivateKey priv = pair.getPrivate(); PrivateKey priv = pair.getPrivate();
@ -2130,7 +2133,7 @@ public class WolfCryptCipherTest {
byte[] plaintext = null; byte[] plaintext = null;
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA"); KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA");
keyGen.initialize(2048, new SecureRandom()); keyGen.initialize(2048, secureRandom);
KeyPair pair = keyGen.generateKeyPair(); KeyPair pair = keyGen.generateKeyPair();
PrivateKey priv = pair.getPrivate(); PrivateKey priv = pair.getPrivate();

9
src/test/java/com/wolfssl/provider/jce/test/WolfCryptKeyAgreementTest.java
View File

@ -100,6 +100,9 @@ public class WolfCryptKeyAgreementTest {
private static ArrayList<String> disabledCurves = private static ArrayList<String> disabledCurves =
new ArrayList<String>(); new ArrayList<String>();
/* One static SecureRandom to share */
private static SecureRandom secureRandom = new SecureRandom();
private static void printDisabledCurves() { private static void printDisabledCurves() {
if (disabledCurves.size() > 0) if (disabledCurves.size() > 0)
@ -185,7 +188,7 @@ public class WolfCryptKeyAgreementTest {
/* initialize key pair generator */ /* initialize key pair generator */
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "wolfJCE"); KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "wolfJCE");
keyGen.initialize(dhParams, new SecureRandom()); keyGen.initialize(dhParams, secureRandom);
KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "wolfJCE"); KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "wolfJCE");
KeyAgreement bKeyAgree = KeyAgreement.getInstance("DH", "wolfJCE"); KeyAgreement bKeyAgree = KeyAgreement.getInstance("DH", "wolfJCE");
@ -236,7 +239,7 @@ public class WolfCryptKeyAgreementTest {
/* initialize key pair generator */ /* initialize key pair generator */
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "wolfJCE"); KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "wolfJCE");
keyGen.initialize(dhParams, new SecureRandom()); keyGen.initialize(dhParams, secureRandom);
KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "wolfJCE"); KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "wolfJCE");
KeyAgreement bKeyAgree = KeyAgreement.getInstance("DH", "wolfJCE"); KeyAgreement bKeyAgree = KeyAgreement.getInstance("DH", "wolfJCE");
@ -290,7 +293,7 @@ public class WolfCryptKeyAgreementTest {
/* initialize key pair generator */ /* initialize key pair generator */
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "wolfJCE"); KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "wolfJCE");
keyGen.initialize(dhParams, new SecureRandom()); keyGen.initialize(dhParams, secureRandom);
KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "wolfJCE"); KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "wolfJCE");
KeyAgreement bKeyAgree = KeyAgreement.getInstance("DH"); KeyAgreement bKeyAgree = KeyAgreement.getInstance("DH");

27
src/test/java/com/wolfssl/provider/jce/test/WolfCryptSignatureTest.java
View File

@ -68,6 +68,9 @@ public class WolfCryptSignatureTest {
private static ArrayList<String> enabledAlgos = private static ArrayList<String> enabledAlgos =
new ArrayList<String>(); new ArrayList<String>();
/* One static SecureRandom to share */
private static SecureRandom secureRandom = new SecureRandom();
@BeforeClass @BeforeClass
public static void testProviderInstallationAtRuntime() public static void testProviderInstallationAtRuntime()
throws NoSuchProviderException { throws NoSuchProviderException {
@ -131,12 +134,8 @@ public class WolfCryptSignatureTest {
assertNotNull(signer); assertNotNull(signer);
assertNotNull(verifier); assertNotNull(verifier);
SecureRandom rand =
SecureRandom.getInstance("HashDRBG", "wolfJCE");
assertNotNull(rand);
/* generate key pair */ /* generate key pair */
KeyPair pair = generateKeyPair(enabledAlgos.get(i), rand); KeyPair pair = generateKeyPair(enabledAlgos.get(i), secureRandom);
assertNotNull(pair); assertNotNull(pair);
PrivateKey priv = pair.getPrivate(); PrivateKey priv = pair.getPrivate();
@ -180,12 +179,8 @@ public class WolfCryptSignatureTest {
assertNotNull(signer); assertNotNull(signer);
assertNotNull(verifier); assertNotNull(verifier);
SecureRandom rand =
SecureRandom.getInstance("HashDRBG", "wolfJCE");
assertNotNull(rand);
/* generate key pair */ /* generate key pair */
KeyPair pair = generateKeyPair(enabledAlgos.get(i), rand); KeyPair pair = generateKeyPair(enabledAlgos.get(i), secureRandom);
assertNotNull(pair); assertNotNull(pair);
PrivateKey priv = pair.getPrivate(); PrivateKey priv = pair.getPrivate();
@ -241,12 +236,8 @@ public class WolfCryptSignatureTest {
return; return;
} }
SecureRandom rand =
SecureRandom.getInstance("HashDRBG", "wolfJCE");
assertNotNull(rand);
/* generate key pair */ /* generate key pair */
KeyPair pair = generateKeyPair(enabledAlgos.get(i), rand); KeyPair pair = generateKeyPair(enabledAlgos.get(i), secureRandom);
assertNotNull(pair); assertNotNull(pair);
PrivateKey priv = pair.getPrivate(); PrivateKey priv = pair.getPrivate();
@ -297,12 +288,8 @@ public class WolfCryptSignatureTest {
return; return;
} }
SecureRandom rand =
SecureRandom.getInstance("HashDRBG", "wolfJCE");
assertNotNull(rand);
/* generate key pair */ /* generate key pair */
KeyPair pair = generateKeyPair(enabledAlgos.get(i), rand); KeyPair pair = generateKeyPair(enabledAlgos.get(i), secureRandom);
assertNotNull(pair); assertNotNull(pair);
PrivateKey priv = pair.getPrivate(); PrivateKey priv = pair.getPrivate();