X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=test%2Fpoly1305_internal_test.c;h=7f7a9e39c5bf4a755e575ff1a04633bf50a073aa;hb=f09877c12c830d16f38064dace415679e867fc0f;hp=3631f3488a0c872a5f8e90f5ef25256aa6d29088;hpb=d807db26a403b4de69d7846656362e70f5083428;p=oweals%2Fopenssl.git

diff --git a/test/poly1305_internal_test.c b/test/poly1305_internal_test.c
index 3631f3488a..7f7a9e39c5 100644
--- a/test/poly1305_internal_test.c
+++ b/test/poly1305_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -16,7 +16,6 @@
 #include "internal/poly1305.h"
 #include "../crypto/poly1305/poly1305_local.h"
 #include "internal/nelem.h"
-#include "internal/cryptlib.h"
 
 typedef struct {
     size_t size;
@@ -35,45 +34,6 @@ typedef struct {
  *
  ***/
 
-static void benchmark_poly1305()
-{
-# ifdef OPENSSL_CPUID_OBJ
-    POLY1305 poly1305;
-    unsigned char key[32];
-    unsigned char buf[8192];
-    uint32_t stopwatch;
-    unsigned int i;
-
-    memset (buf,0x55,sizeof(buf));
-    memset (key,0xAA,sizeof(key));
-
-    Poly1305_Init(&poly1305, key);
-
-    for (i=0;i<100000;i++)
-        Poly1305_Update(&poly1305,buf,sizeof(buf));
-
-    stopwatch = OPENSSL_rdtsc();
-    for (i=0;i<10000;i++)
-        Poly1305_Update(&poly1305,buf,sizeof(buf));
-    stopwatch = OPENSSL_rdtsc() - stopwatch;
-
-    printf("%g\n",stopwatch/(double)(i*sizeof(buf)));
-
-    stopwatch = OPENSSL_rdtsc();
-    for (i=0;i<10000;i++) {
-        Poly1305_Init(&poly1305, key);
-        Poly1305_Update(&poly1305,buf,16);
-        Poly1305_Final(&poly1305,buf);
-    }
-    stopwatch = OPENSSL_rdtsc() - stopwatch;
-
-    printf("%g\n",stopwatch/(double)(i));
-# else
-    fprintf(stderr,
-            "Benchmarking of poly1305 isn't available on this platform\n");
-# endif
-}
-
 static TESTDATA tests[] = {
     /*
      * RFC7539
@@ -1611,18 +1571,6 @@ static int test_poly1305(int idx)
 
 int setup_tests(void)
 {
-    if (test_has_option("-h")) {
-        printf("-h\tThis help\n");
-        printf("-b\tBenchmark in addition to the tests\n");
-        return 1;
-    }
-
     ADD_ALL_TESTS(test_poly1305, OSSL_NELEM(tests));
     return 1;
 }
-
-void cleanup_tests(void)
-{
-    if (test_has_option("-b"))
-        benchmark_poly1305();
-}