diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-12-28 08:57:16 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-02-05 11:14:23 +0100 |
| commit | 0f5e9ef40597f2d3d7cb0bd4cb21b497564e80e0 (patch) | |
| tree | 629cf199c1497650a51a7323ce53fbb895d0633c | |
| parent | 66f2a0a271bcc10e8fb68771f9349a3d3ecf6dda (diff) | |
| download | gnutls-0f5e9ef40597f2d3d7cb0bd4cb21b497564e80e0.tar.gz | |
tests: modified tests for the disablement of 3DES
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | tests/dtls1-2-mtu-check.c | 2 | ||||
| -rw-r--r-- | tests/priorities.c | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/dtls1-2-mtu-check.c b/tests/dtls1-2-mtu-check.c index b2bb739474..b42cd220de 100644 --- a/tests/dtls1-2-mtu-check.c +++ b/tests/dtls1-2-mtu-check.c @@ -79,7 +79,7 @@ static void dtls_mtu_try(const char *name, const char *client_prio, serverx509cred); assert(gnutls_priority_set_direct(server, - "NORMAL:+ANON-ECDH:+ANON-DH:+ECDHE-RSA:+DHE-RSA:+RSA:+ECDHE-ECDSA:+CURVE-X25519", + "NORMAL:+ANON-ECDH:+ANON-DH:+3DES-CBC:+ECDHE-RSA:+DHE-RSA:+RSA:+ECDHE-ECDSA:+CURVE-X25519", NULL) >= 0); gnutls_transport_set_push_function(server, server_push); gnutls_transport_set_pull_function(server, server_pull); diff --git a/tests/priorities.c b/tests/priorities.c index dd7753c448..38738e3773 100644 --- a/tests/priorities.c +++ b/tests/priorities.c @@ -93,27 +93,27 @@ try_prio(const char *prio, unsigned expected_cs, unsigned expected_ciphers, unsi void doit(void) { - const int normal = 57; + const int normal = 53; const int null = 5; const int sec128 = 53; - try_prio("PFS", 42, 12, __LINE__); - try_prio("NORMAL", normal, 12, __LINE__); - try_prio("NORMAL:-MAC-ALL:+MD5:+MAC-ALL", normal, 12, __LINE__); + try_prio("PFS", 39, 11, __LINE__); + try_prio("NORMAL", normal, 11, __LINE__); + try_prio("NORMAL:-MAC-ALL:+MD5:+MAC-ALL", normal, 11, __LINE__); #ifndef ENABLE_FIPS140 - try_prio("NORMAL:+CIPHER-ALL", normal, 12, __LINE__); /* all (except null) */ + try_prio("NORMAL:+CIPHER-ALL", normal, 11, __LINE__); /* all (except null) */ try_prio("NORMAL:-CIPHER-ALL:+NULL", null, 1, __LINE__); /* null */ - try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL", normal + null, 13, __LINE__); /* should be null + all */ + try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL", normal + null, 12, __LINE__); /* should be null + all */ try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL:-CIPHER-ALL:+AES-128-CBC", 8, 1, __LINE__); /* should be null + all */ #endif - try_prio("PERFORMANCE", normal, 12, __LINE__); + try_prio("PERFORMANCE", normal, 11, __LINE__); try_prio("SECURE256", 22, 6, __LINE__); try_prio("SECURE128", sec128, 11, __LINE__); try_prio("SECURE128:+SECURE256", sec128, 11, __LINE__); /* should be the same as SECURE128 */ - try_prio("SECURE128:+SECURE256:+NORMAL", normal, 12, __LINE__); /* should be the same as NORMAL */ + try_prio("SECURE128:+SECURE256:+NORMAL", normal, 11, __LINE__); /* should be the same as NORMAL */ try_prio("SUITEB192", 1, 1, __LINE__); try_prio("SUITEB128", 2, 2, __LINE__); /* check legacy strings */ - try_prio("NORMAL:+RSA-EXPORT:+ARCFOUR-40", normal, 12, __LINE__); + try_prio("NORMAL:+RSA-EXPORT:+ARCFOUR-40", normal, 11, __LINE__); } |