The HMAC subsystem can now be used for other MAC algorithms, like UMAC. UMAC-96 and UMAC-128 were conditionally added.

2 files changed, 17 insertions, 23 deletions

diff --git a/src/benchmark-cipher.c b/src/benchmark-cipher.c
index 0a4510f86d..80a703e940 100644
--- a/src/benchmark-cipher.c
+++ b/src/benchmark-cipher.c
@@ -212,7 +212,7 @@ void benchmark_cipher (int init, int debug_level)
       gnutls_rnd( GNUTLS_RND_NONCE, data, sizeof(data));
     }
 
-  cipher_mac_bench ( GNUTLS_CIPHER_SALSA20R20_128, GNUTLS_MAC_SHA1, 16);
+  cipher_mac_bench ( GNUTLS_CIPHER_SALSA20R20_256, GNUTLS_MAC_SHA1, 16);
   cipher_mac_bench ( GNUTLS_CIPHER_AES_128_CBC, GNUTLS_MAC_SHA1, 16);
   cipher_mac_bench ( GNUTLS_CIPHER_AES_128_CBC, GNUTLS_MAC_SHA256, 16);
   cipher_bench ( GNUTLS_CIPHER_AES_128_GCM, 16, 1);
@@ -227,7 +227,7 @@ void benchmark_cipher (int init, int debug_level)
 
   cipher_bench (GNUTLS_CIPHER_ARCFOUR, 16, 0);
 
-  cipher_bench ( GNUTLS_CIPHER_SALSA20R20_128, 16, 0);
+  cipher_bench ( GNUTLS_CIPHER_SALSA20R20_256, 16, 0);
 
   gnutls_global_deinit();
 }
diff --git a/src/benchmark-tls.c b/src/benchmark-tls.c
index 7e4199ebbb..f3ef0cd486 100644
--- a/src/benchmark-tls.c
+++ b/src/benchmark-tls.c
@@ -48,11 +48,14 @@ const char* side = "";
 #define PRIO_ECDHE_ECDSA "NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+ECDHE-ECDSA:+CURVE-SECP192R1"
 #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_SALSA20R20_256_UMAC_96 "NONE:+VERS-TLS1.0:+SALSA20R20-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"
 #define PRIO_AES_GCM "NONE:+VERS-TLS1.2:+AES-128-GCM:+AEAD:+SIGN-ALL:+COMP-NULL:+RSA"
 #define PRIO_CAMELLIA_CBC_SHA1 "NONE:+VERS-TLS1.0:+CAMELLIA-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA"
-#define PRIO_SALSA20R20_128_SHA1 "NONE:+VERS-TLS1.0:+SALSA20R20-128:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA"
+#define PRIO_SALSA20R20_256_SHA1 "NONE:+VERS-TLS1.0:+SALSA20R20-256:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA"
 
 static const int rsa_bits = 1776, ec_bits = 192;
 
@@ -435,29 +438,20 @@ void benchmark_tls(int debug_level, int ciphers)
       {
         printf("Testing throughput in cipher/MAC combinations:\n\n");
 
-        test_ciphersuite(PRIO_ARCFOUR_128_MD5, 1024);
-        test_ciphersuite(PRIO_ARCFOUR_128_MD5, 4096);
-        test_ciphersuite(PRIO_ARCFOUR_128_MD5, 8 * 1024);
+        test_ciphersuite(PRIO_SALSA20R20_256_UMAC_96, 1400);
+        test_ciphersuite(PRIO_SALSA20R20_256_SHA1, 1400);
+        test_ciphersuite(PRIO_ARCFOUR_128_SHA1, 1400);
+        test_ciphersuite(PRIO_ARCFOUR_128_MD5, 1400);
+        test_ciphersuite(PRIO_AES_GCM, 1400);
+        test_ciphersuite(PRIO_AES_CBC_SHA1, 1400);
+        test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, 1400);
+
+        test_ciphersuite(PRIO_SALSA20R20_256_UMAC_96, 15 * 1024);
+        test_ciphersuite(PRIO_SALSA20R20_256_SHA1, 15*1024);
+        test_ciphersuite(PRIO_ARCFOUR_128_SHA1, 15 * 1024);
         test_ciphersuite(PRIO_ARCFOUR_128_MD5, 15 * 1024);
-
-        test_ciphersuite(PRIO_SALSA20R20_128_SHA1, 1024);
-        test_ciphersuite(PRIO_SALSA20R20_128_SHA1, 4096);
-        test_ciphersuite(PRIO_SALSA20R20_128_SHA1, 8*1024);
-        test_ciphersuite(PRIO_SALSA20R20_128_SHA1, 15*1024);
-
-        test_ciphersuite(PRIO_AES_GCM, 1024);
-        test_ciphersuite(PRIO_AES_GCM, 4096);
-        test_ciphersuite(PRIO_AES_GCM, 8 * 1024);
         test_ciphersuite(PRIO_AES_GCM, 15 * 1024);
-
-        test_ciphersuite(PRIO_AES_CBC_SHA1, 1024);
-        test_ciphersuite(PRIO_AES_CBC_SHA1, 4096);
-        test_ciphersuite(PRIO_AES_CBC_SHA1, 8 * 1024);
         test_ciphersuite(PRIO_AES_CBC_SHA1, 15 * 1024);
-
-        test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, 1024);
-        test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, 4096);
-        test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, 8 * 1024);
         test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, 15 * 1024);
       }
     else