From bd827099059528e1322b59387904ec3b1b96ccf2 Mon Sep 17 00:00:00 2001 From: Jack Tjaden Date: Tue, 4 Mar 2025 14:06:17 -0700 Subject: [PATCH] Changed RSA_TIME variable to more generic TEST_TIME --- examples/provider/CryptoBenchmark.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/provider/CryptoBenchmark.java b/examples/provider/CryptoBenchmark.java index 1cf2da0..b516e1f 100644 --- a/examples/provider/CryptoBenchmark.java +++ b/examples/provider/CryptoBenchmark.java @@ -30,7 +30,7 @@ public class CryptoBenchmark { private static final int DES3_BLOCK_SIZE = 8; private static final int GCM_TAG_LENGTH = 128; private static final int[] RSA_KEY_SIZES = {2048, 3072, 4096}; - private static final int RSA_MIN_TIME_SECONDS = 1; /* minimum time to run each test */ + private static final int TEST_MIN_TIME_SECONDS = 1; /* minimum time to run each test */ private static final int SMALL_MESSAGE_SIZE = 32; /* small message size for RSA ops */ private static final String[] ECC_CURVES = {"secp256r1"}; /* Can add more curves benchmark.c only uses secp256r1 */ private static final int[] DH_KEY_SIZES = {2048}; /* Can add more key sizes benchmark.c only uses 2048 */ @@ -357,7 +357,7 @@ private static void runRSABenchmark(String providerName, int keySize) throws Exc keyGen.generateKeyPair(); keyGenOps++; elapsedTime = (System.nanoTime() - startTime) / 1_000_000_000.0; - } while (elapsedTime < RSA_MIN_TIME_SECONDS); + } while (elapsedTime < TEST_MIN_TIME_SECONDS); keyGenOp = String.format("RSA %d key gen", keySize); printKeyGenResults(keyGenOps, elapsedTime, keyGenOp, providerName, cipherMode); @@ -376,7 +376,7 @@ private static void runRSABenchmark(String providerName, int keySize) throws Exc cipher.doFinal(testData); publicOps++; elapsedTime = (System.nanoTime() - startTime) / 1_000_000_000.0; - } while (elapsedTime < RSA_MIN_TIME_SECONDS); + } while (elapsedTime < TEST_MIN_TIME_SECONDS); printKeyGenResults(publicOps, elapsedTime, "RSA 2048 public", providerName, cipherMode); @@ -392,7 +392,7 @@ private static void runRSABenchmark(String providerName, int keySize) throws Exc cipher.doFinal(encrypted); privateOps++; elapsedTime = (System.nanoTime() - startTime) / 1_000_000_000.0; - } while (elapsedTime < RSA_MIN_TIME_SECONDS); + } while (elapsedTime < TEST_MIN_TIME_SECONDS); printKeyGenResults(privateOps, elapsedTime, "RSA 2048 private", providerName, cipherMode); } @@ -423,7 +423,7 @@ private static void runECCBenchmark(String providerName, String curveName) throw keyGen.generateKeyPair(); keyGenOps++; elapsedTime = (System.nanoTime() - startTime) / 1_000_000_000.0; - } while (elapsedTime < RSA_MIN_TIME_SECONDS); + } while (elapsedTime < TEST_MIN_TIME_SECONDS); String keyGenOp = String.format("ECC %s key gen", curveName); printKeyGenResults(keyGenOps, elapsedTime, keyGenOp, providerName, "EC"); @@ -523,7 +523,7 @@ private static void runDHBenchmark(String providerName, int keySize) throws Exce keyGen.generateKeyPair(); keyGenOps++; elapsedTime = (System.nanoTime() - startTime) / 1_000_000_000.0; - } while (elapsedTime < RSA_MIN_TIME_SECONDS); + } while (elapsedTime < TEST_MIN_TIME_SECONDS); String keyGenOp = String.format("DH %d key gen", keySize); printKeyGenResults(keyGenOps, elapsedTime, keyGenOp, providerName, DH_ALGORITHM); @@ -545,7 +545,7 @@ private static void runDHBenchmark(String providerName, int keySize) throws Exce keyAgreement.generateSecret(); agreementOps++; elapsedTime = (System.nanoTime() - startTime) / 1_000_000_000.0; - } while (elapsedTime < RSA_MIN_TIME_SECONDS); + } while (elapsedTime < TEST_MIN_TIME_SECONDS); String agreementOp = String.format("DH %d agree", keySize); printKeyGenResults(agreementOps, elapsedTime, agreementOp, providerName, DH_ALGORITHM);