From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 14 Dec 2013 17:22:28 +0000 (+0100)
Subject: removed UMAC ciphersuites from benchmark
X-Git-Tag: gnutls_3_3_0pre0~461
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e664eede907ff973b87a6ffa02df22151258b919;p=thirdparty%2Fgnutls.git

removed UMAC ciphersuites from benchmark
---

diff --git a/src/benchmark-tls.c b/src/benchmark-tls.c
index 5fcde166ae..161e02beb3 100644
--- a/src/benchmark-tls.c
+++ b/src/benchmark-tls.c
@@ -49,7 +49,6 @@ const char *side = "";
 #define PRIO_RSA "NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA"
 
 #define PRIO_ARCFOUR_128_SHA1 "NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA"
-#define PRIO_SALSA20_256_UMAC_96 "NONE:+VERS-TLS1.0:+SALSA20-256:+UMAC-96:+SIGN-ALL:+COMP-NULL:+RSA"
 
 #define PRIO_AES_CBC_SHA1 "NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA"
 #define PRIO_ARCFOUR_128_MD5 "NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+SIGN-ALL:+COMP-NULL:+RSA"
@@ -460,7 +459,6 @@ void benchmark_tls(int debug_level, int ciphers)
 		    ("Testing throughput in cipher/MAC combinations (payload: %d bytes)\n",
 		     size);
 
-		test_ciphersuite(PRIO_SALSA20_256_UMAC_96, size);
 		test_ciphersuite(PRIO_SALSA20_256_SHA1, size);
 		test_ciphersuite(PRIO_ARCFOUR_128_SHA1, size);
 		test_ciphersuite(PRIO_ARCFOUR_128_MD5, size);
@@ -472,7 +470,6 @@ void benchmark_tls(int debug_level, int ciphers)
 		printf
 		    ("\nTesting throughput in cipher/MAC combinations (payload: %d bytes)\n",
 		     size);
-		test_ciphersuite(PRIO_SALSA20_256_UMAC_96, size);
 		test_ciphersuite(PRIO_SALSA20_256_SHA1, size);
 		test_ciphersuite(PRIO_ARCFOUR_128_SHA1, size);
 		test_ciphersuite(PRIO_ARCFOUR_128_MD5, size);