summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2017-05-20 20:20:34 +0200
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2017-05-20 20:20:36 +0200
commit0205de0fdc0007e6e1511656cc7579ab306b667d (patch)
tree03b7ced8040307a85c0b80d8229d02cf1516d1fa
parente3f5a96c9fbb5a44d4ca83848ec5ad97df2ecf15 (diff)
downloadgnutls-0205de0fdc0007e6e1511656cc7579ab306b667d.tar.gz
gnutls-cli: no longer include arcfour in benchmarks
This cipher is considered broken and no longer included in the default set of ciphers. Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r--src/benchmark-cipher.c1
-rw-r--r--src/benchmark-tls.c7
2 files changed, 0 insertions, 8 deletions
diff --git a/src/benchmark-cipher.c b/src/benchmark-cipher.c
index 24d3665e8f..7b6e6799e2 100644
--- a/src/benchmark-cipher.c
+++ b/src/benchmark-cipher.c
@@ -294,7 +294,6 @@ void benchmark_cipher(int debug_level)
printf("\nChecking ciphers, payload size: %u\n", size * 1024);
cipher_bench(GNUTLS_CIPHER_3DES_CBC, size, 0);
cipher_bench(GNUTLS_CIPHER_AES_128_CBC, size, 0);
- cipher_bench(GNUTLS_CIPHER_ARCFOUR, size, 0);
cipher_bench(GNUTLS_CIPHER_SALSA20_256, size, 0);
gnutls_global_deinit();
diff --git a/src/benchmark-tls.c b/src/benchmark-tls.c
index d97b61a585..745c3df80b 100644
--- a/src/benchmark-tls.c
+++ b/src/benchmark-tls.c
@@ -51,10 +51,7 @@ const char *side = "";
#define PRIO_RSA "NONE:+VERS-TLS1.2:+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_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_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:+ECDHE-RSA:+CURVE-ALL"
@@ -502,8 +499,6 @@ void benchmark_tls(int debug_level, int ciphers)
("Testing throughput in cipher/MAC combinations (payload: %d bytes)\n",
size);
- test_ciphersuite(PRIO_ARCFOUR_128_SHA1, size);
- 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);
@@ -514,8 +509,6 @@ void benchmark_tls(int debug_level, int ciphers)
printf
("\nTesting throughput in cipher/MAC combinations (payload: %d bytes)\n",
size);
- test_ciphersuite(PRIO_ARCFOUR_128_SHA1, size);
- 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);