From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 28 Mar 2015 10:08:28 +0000 (+0100)
Subject: gnutls-cli: added chacha-poly1305 into benchmarks
X-Git-Tag: gnutls_3_4_0~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d302b3652c21c807cbf2b60f29b1d84a8383d2d;p=thirdparty%2Fgnutls.git

gnutls-cli: added chacha-poly1305 into benchmarks
---

diff --git a/src/benchmark-cipher.c b/src/benchmark-cipher.c
index 1b58f037f0..f5dc5957f2 100644
--- a/src/benchmark-cipher.c
+++ b/src/benchmark-cipher.c
@@ -206,6 +206,7 @@ void benchmark_cipher(int debug_level)
 			 size);
 	cipher_bench(GNUTLS_CIPHER_AES_128_CCM, size, 1);
 	cipher_bench(GNUTLS_CIPHER_AES_128_GCM, size, 1);
+	cipher_bench(GNUTLS_CIPHER_CHACHA20_POLY1305, size, 1);
 
 	printf("\nChecking MAC algorithms, payload size: %u\n", size * 1024);
 	mac_bench(GNUTLS_MAC_SHA1, size);
diff --git a/src/benchmark-tls.c b/src/benchmark-tls.c
index c9484fab01..d5349179dd 100644
--- a/src/benchmark-tls.c
+++ b/src/benchmark-tls.c
@@ -54,6 +54,7 @@ const char *side = "";
 #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_AES_CCM "NONE:+VERS-TLS1.2:+AES-128-CCM:+AEAD:+SIGN-ALL:+COMP-NULL:+RSA"
+#define PRIO_CHACHA_POLY1305 "NONE:+VERS-TLS1.2:+CHACHA20-POLY1305:+AEAD:+SIGN-ALL:+COMP-NULL:+RSA"
 #define PRIO_CAMELLIA_CBC_SHA1 "NONE:+VERS-TLS1.0:+CAMELLIA-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA"
 
 static const int rsa_bits = 3072, ec_bits = 256;
@@ -506,6 +507,7 @@ void benchmark_tls(int debug_level, int ciphers)
 		test_ciphersuite(PRIO_ARCFOUR_128_MD5, size);
 		test_ciphersuite(PRIO_AES_GCM, size);
 		test_ciphersuite(PRIO_AES_CCM, size);
+		test_ciphersuite(PRIO_CHACHA_POLY1305, size);
 		test_ciphersuite(PRIO_AES_CBC_SHA1, size);
 		test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, size);
 
@@ -517,6 +519,7 @@ void benchmark_tls(int debug_level, int ciphers)
 		test_ciphersuite(PRIO_ARCFOUR_128_MD5, size);
 		test_ciphersuite(PRIO_AES_GCM, size);
 		test_ciphersuite(PRIO_AES_CCM, size);
+		test_ciphersuite(PRIO_CHACHA_POLY1305, size);
 		test_ciphersuite(PRIO_AES_CBC_SHA1, size);
 		test_ciphersuite(PRIO_CAMELLIA_CBC_SHA1, size);
 	} else {