diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-12-14 17:54:27 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-12-14 17:54:27 +0100 |
| commit | b0d13f3be6dc5af611443a132c9e10d46be122a7 (patch) | |
| tree | 0baf937c785e6012ab316ece728df81304c01120 | |
| parent | c41bb50c471da8df9e58401ca6e327e7cbf58072 (diff) | |
| download | gnutls-b0d13f3be6dc5af611443a132c9e10d46be122a7.tar.gz | |
removed the estream salsa20 from benchmarks
| -rw-r--r-- | src/benchmark-tls.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/benchmark-tls.c b/src/benchmark-tls.c index 204c494227..5fcde166ae 100644 --- a/src/benchmark-tls.c +++ b/src/benchmark-tls.c @@ -50,14 +50,12 @@ const char *side = ""; #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_ESTREAM_SALSA20_256_UMAC_96 "NONE:+VERS-TLS1.0:+ESTREAM-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" #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_SALSA20_256_SHA1 "NONE:+VERS-TLS1.0:+SALSA20-256:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA" -#define PRIO_ESTREAM_SALSA20_256_SHA1 "NONE:+VERS-TLS1.0:+ESTREAM-SALSA20-256:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA" static const int rsa_bits = 1776, ec_bits = 192; @@ -464,8 +462,6 @@ void benchmark_tls(int debug_level, int ciphers) test_ciphersuite(PRIO_SALSA20_256_UMAC_96, size); test_ciphersuite(PRIO_SALSA20_256_SHA1, size); - test_ciphersuite(PRIO_ESTREAM_SALSA20_256_UMAC_96, size); - test_ciphersuite(PRIO_ESTREAM_SALSA20_256_SHA1, size); test_ciphersuite(PRIO_ARCFOUR_128_SHA1, size); test_ciphersuite(PRIO_ARCFOUR_128_MD5, size); test_ciphersuite(PRIO_AES_GCM, size); @@ -478,8 +474,6 @@ void benchmark_tls(int debug_level, int ciphers) size); test_ciphersuite(PRIO_SALSA20_256_UMAC_96, size); test_ciphersuite(PRIO_SALSA20_256_SHA1, size); - test_ciphersuite(PRIO_ESTREAM_SALSA20_256_UMAC_96, size); - test_ciphersuite(PRIO_ESTREAM_SALSA20_256_SHA1, size); test_ciphersuite(PRIO_ARCFOUR_128_SHA1, size); test_ciphersuite(PRIO_ARCFOUR_128_MD5, size); test_ciphersuite(PRIO_AES_GCM, size); |