Skip to content

Commit 76e6956

Browse files
committed
keg gen init duplication fix
1 parent da7b4b6 commit 76e6956

File tree

1 file changed

+13
-29
lines changed

1 file changed

+13
-29
lines changed

examples/provider/CryptoBenchmark.java

Lines changed: 13 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ private static void setupDigestProvider(String testProviderName) {
193193
}
194194
}
195195

196-
/* Add this helper method to the CryptoBenchmark class */
197196
private static KeyPairGenerator initializeKeyGenerator(String keyType, String keyGenProvider) throws Exception {
198197
KeyPairGenerator keyGen;
199198

@@ -785,23 +784,21 @@ private static void runSignatureBenchmark(String algorithm, String providerName)
785784
signatureProvider = "SunRsaSign";
786785
}
787786
} else if (algorithm.contains("withECDSA")) {
788-
keyType = "EC";
789-
if (providerName.equals("SunJCE")) {
790-
Provider sunECProvider = Security.getProvider("SunEC");
791-
if (sunECProvider == null) {
792-
try {
793-
Provider sunEC = new sun.security.ec.SunEC();
794-
Security.addProvider(sunEC);
795-
} catch (Exception e) {
796-
throw new Exception("SunEC provider not available: " + e.getMessage());
787+
keyType = "EC";
788+
if (providerName.equals("SunJCE")) {
789+
Provider sunECProvider = Security.getProvider("SunEC");
790+
if (sunECProvider == null) {
791+
try {
792+
Provider sunEC = new sun.security.ec.SunEC();
793+
Security.addProvider(sunEC);
794+
} catch (Exception e) {
795+
throw new Exception("SunEC provider not available: " + e.getMessage());
796+
}
797797
}
798+
keyGenProvider = "SunEC";
799+
signatureProvider = "SunEC";
798800
}
799-
keyGenProvider = "SunEC";
800-
signatureProvider = "SunEC";
801-
802-
}
803-
}
804-
else if (algorithm.contains("withDSA")) {
801+
} else if (algorithm.contains("withDSA")) {
805802
keyType = "DSA";
806803
if (providerName.equals("SunJCE")) {
807804
keyGenProvider = "SUN";
@@ -815,19 +812,6 @@ else if (algorithm.contains("withDSA")) {
815812
/* Initialize key generator and signature with correct providers */
816813
keyGen = initializeKeyGenerator(keyType, keyGenProvider);
817814
signature = Signature.getInstance(algorithm, signatureProvider);
818-
819-
/* Initialize key generator based on type */
820-
if (keyType.equals("RSA")) {
821-
keyGen.initialize(2048);
822-
} else if (keyType.equals("EC")) {
823-
if (keyGenProvider.equals("SunEC")) {
824-
keyGen.initialize(new ECGenParameterSpec("secp256r1"));
825-
} else {
826-
keyGen.initialize(new ECGenParameterSpec("secp256r1"));
827-
}
828-
} else if (keyType.equals("DSA")) {
829-
keyGen.initialize(1024);
830-
}
831815

832816
/* Generate key pair */
833817
keyPair = keyGen.generateKeyPair();

0 commit comments

Comments
 (0)