diff options
author | Richard Levitte <levitte@openssl.org> | 2018-02-06 20:01:19 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-02-06 22:54:19 +0100 |
commit | 7ff3a3b9e98104e3d080e652712c42b0dff915dd (patch) | |
tree | b4fb5ee1b24f631a8ff3835d712a6170b87cbe14 /test/modes_internal_test.c | |
parent | a3a5d1b73db46274e2cdedaad42fda5ce5cfb2da (diff) |
Code cleanup: remove benchmark code from internal tests
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/5268)
Diffstat (limited to 'test/modes_internal_test.c')
-rw-r--r-- | test/modes_internal_test.c | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c index 6b02fd0148..5f48bc13f9 100644 --- a/test/modes_internal_test.c +++ b/test/modes_internal_test.c @@ -17,7 +17,6 @@ #include "../crypto/modes/modes_lcl.h" #include "testutil.h" #include "internal/nelem.h" -#include "internal/cryptlib.h" typedef struct { size_t size; @@ -884,75 +883,10 @@ static int test_gcm128(int idx) return 1; } -static void benchmark_gcm128(const unsigned char *K, size_t Klen, - const unsigned char *IV, size_t IVlen) -{ -#ifdef OPENSSL_CPUID_OBJ - GCM128_CONTEXT ctx; - AES_KEY key; - uint32_t start, gcm_t, ctr_t; - union { - u64 u; - u8 c[1024]; - } buf; - - AES_set_encrypt_key(K, Klen * 8, &key); - CRYPTO_gcm128_init(&ctx, &key, (block128_f) AES_encrypt); - CRYPTO_gcm128_setiv(&ctx, IV, IVlen); - - CRYPTO_gcm128_encrypt(&ctx, buf.c, buf.c, sizeof(buf)); - start = OPENSSL_rdtsc(); - CRYPTO_gcm128_encrypt(&ctx, buf.c, buf.c, sizeof(buf)); - gcm_t = OPENSSL_rdtsc() - start; - - CRYPTO_ctr128_encrypt(buf.c, buf.c, sizeof(buf), - &key, ctx.Yi.c, ctx.EKi.c, &ctx.mres, - (block128_f) AES_encrypt); - start = OPENSSL_rdtsc(); - CRYPTO_ctr128_encrypt(buf.c, buf.c, sizeof(buf), - &key, ctx.Yi.c, ctx.EKi.c, &ctx.mres, - (block128_f) AES_encrypt); - ctr_t = OPENSSL_rdtsc() - start; - - printf("%.2f-%.2f=%.2f\n", - gcm_t / (double)sizeof(buf), - ctr_t / (double)sizeof(buf), - (gcm_t - ctr_t) / (double)sizeof(buf)); -# ifdef GHASH - { - void (*gcm_ghash_p) (u64 Xi[2], const u128 Htable[16], - const u8 *inp, size_t len) = ctx.ghash; - - GHASH((&ctx), buf.c, sizeof(buf)); - start = OPENSSL_rdtsc(); - for (i = 0; i < 100; ++i) - GHASH((&ctx), buf.c, sizeof(buf)); - gcm_t = OPENSSL_rdtsc() - start; - printf("%.2f\n", gcm_t / (double)sizeof(buf) / (double)i); - } -# endif -#else - fprintf(stderr, - "Benchmarking of modes isn't available on this platform\n"); -#endif -} - int setup_tests(void) { - if (test_has_option("-h")) { - printf("-h\tThis help\n"); - printf("-b\tBenchmark gcm128 in addition to the tests\n"); - return 1; - } - ADD_ALL_TESTS(test_aes_cts128, OSSL_NELEM(aes_cts128_vectors)); ADD_ALL_TESTS(test_aes_cts128_nist, OSSL_NELEM(aes_cts128_vectors)); ADD_ALL_TESTS(test_gcm128, OSSL_NELEM(gcm128_vectors)); return 1; } - -void cleanup_tests(void) -{ - if (test_has_option("-b")) - benchmark_gcm128(K1, sizeof(K1), IV1, sizeof(IV1)); -} |