diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-01-20 10:29:35 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-01-20 11:04:15 +0100 |
| commit | 44cde2ed956062cb062608d1b12308ac1be4ec26 (patch) | |
| tree | 2cfcd311a1ea97ebc84511d8e7edf4c86c3c8622 | |
| parent | 09713e8e08f90470783e410dafc8871599987f72 (diff) | |
| download | gnutls-44cde2ed956062cb062608d1b12308ac1be4ec26.tar.gz | |
Revert "Revert "tests: updated to account for ARCFOUR being disabled""
This reverts commit a2f907d0d4e52eb4dd24cc1f5d7d892b21abfd83.
| -rw-r--r-- | tests/mini-global-load.c | 2 | ||||
| -rw-r--r-- | tests/mini-x509.c | 2 | ||||
| -rw-r--r-- | tests/priorities.c | 14 | ||||
| -rw-r--r-- | tests/record-sizes.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/tests/mini-global-load.c b/tests/mini-global-load.c index 68615f72af..6e7632d068 100644 --- a/tests/mini-global-load.c +++ b/tests/mini-global-load.c @@ -124,7 +124,7 @@ void doit(void) gnutls_init(&client, GNUTLS_CLIENT); gnutls_credentials_set(client, GNUTLS_CRD_CERTIFICATE, clientx509cred); - gnutls_priority_set_direct(client, "NORMAL", NULL); + gnutls_priority_set_direct(client, "NORMAL:+ARCFOUR-128", NULL); gnutls_transport_set_push_function(client, client_push); gnutls_transport_set_pull_function(client, client_pull); gnutls_transport_set_ptr(client, client); diff --git a/tests/mini-x509.c b/tests/mini-x509.c index c4240fdb7c..7ec0b85def 100644 --- a/tests/mini-x509.c +++ b/tests/mini-x509.c @@ -197,7 +197,7 @@ void doit(void) if (ret < 0) exit(1); - gnutls_priority_set_direct(client, "NORMAL", NULL); + gnutls_priority_set_direct(client, "NORMAL:+ARCFOUR-128", NULL); gnutls_transport_set_push_function(client, client_push); gnutls_transport_set_pull_function(client, client_pull); gnutls_transport_set_ptr(client, client); diff --git a/tests/priorities.c b/tests/priorities.c index 7b9de3cc64..4010106517 100644 --- a/tests/priorities.c +++ b/tests/priorities.c @@ -100,21 +100,21 @@ try_prio(const char *prio, unsigned expected_cs, unsigned expected_ciphers) void doit(void) { - const int normal = 66; + const int normal = 61; const int null = 5; const int sec128 = 56; - try_prio("NORMAL", normal, 10); - try_prio("NORMAL:-MAC-ALL:+MD5:+MAC-ALL", normal, 10); - try_prio("NORMAL:+CIPHER-ALL", normal, 10); /* all (except null) */ + try_prio("NORMAL", normal, 9); + try_prio("NORMAL:-MAC-ALL:+MD5:+MAC-ALL", normal, 9); + try_prio("NORMAL:+CIPHER-ALL", normal, 9); /* all (except null) */ try_prio("NORMAL:-CIPHER-ALL:+NULL", null, 1); /* null */ - try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL", normal + null, 11); /* should be null + all */ + try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL", normal + null, 10); /* should be null + all */ try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL:-CIPHER-ALL:+AES-128-CBC", 10, 1); /* should be null + all */ - try_prio("PERFORMANCE", normal, 10); + try_prio("PERFORMANCE", normal, 9); try_prio("SECURE256", 20, 4); try_prio("SECURE128", sec128, 8); try_prio("SECURE128:+SECURE256", sec128, 8); /* should be the same as SECURE128 */ - try_prio("SECURE128:+SECURE256:+NORMAL", normal, 10); /* should be the same as NORMAL */ + try_prio("SECURE128:+SECURE256:+NORMAL", normal, 9); /* should be the same as NORMAL */ try_prio("SUITEB192", 1, 1); } diff --git a/tests/record-sizes.c b/tests/record-sizes.c index 4f52e54a02..1683da14f2 100644 --- a/tests/record-sizes.c +++ b/tests/record-sizes.c @@ -90,7 +90,7 @@ void doit(void) gnutls_anon_allocate_client_credentials(&c_anoncred); gnutls_init(&client, GNUTLS_CLIENT); gnutls_priority_set_direct(client, - "NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-DH", + "NONE:+VERS-TLS-ALL:+CIPHER-ALL:+ARCFOUR-128:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-DH", NULL); gnutls_credentials_set(client, GNUTLS_CRD_ANON, c_anoncred); gnutls_transport_set_push_function(client, client_push); |