diff options
| -rw-r--r-- | tests/mini-global-load.c | 4 | ||||
| -rw-r--r-- | tests/mini-x509.c | 4 | ||||
| -rw-r--r-- | tests/priorities.c | 32 | ||||
| -rw-r--r-- | tests/record-sizes.c | 2 |
4 files changed, 19 insertions, 23 deletions
diff --git a/tests/mini-global-load.c b/tests/mini-global-load.c index 68615f72af..f10814e7fa 100644 --- a/tests/mini-global-load.c +++ b/tests/mini-global-load.c @@ -109,11 +109,7 @@ void doit(void) gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE, serverx509cred); gnutls_priority_set_direct(server, -#ifndef ENABLE_FIPS140 - "NORMAL:-CIPHER-ALL:+ARCFOUR-128", -#else "NORMAL:-CIPHER-ALL:+AES-128-CBC", -#endif NULL); gnutls_transport_set_push_function(server, server_push); gnutls_transport_set_pull_function(server, server_pull); diff --git a/tests/mini-x509.c b/tests/mini-x509.c index ba578f145a..610da49620 100644 --- a/tests/mini-x509.c +++ b/tests/mini-x509.c @@ -157,7 +157,7 @@ void doit(void) global_init(); gnutls_global_set_log_function(tls_log_func); if (debug) - gnutls_global_set_log_level(2); + gnutls_global_set_log_level(6); /* Init server */ gnutls_certificate_allocate_credentials(&serverx509cred); @@ -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 ce46955dd5..21fd098d76 100644 --- a/tests/priorities.c +++ b/tests/priorities.c @@ -40,7 +40,7 @@ void doit(void) #else static void -try_prio(const char *prio, unsigned expected_cs, unsigned expected_ciphers) +try_prio(const char *prio, unsigned expected_cs, unsigned expected_ciphers, unsigned line) { int ret; gnutls_priority_t p; @@ -79,7 +79,7 @@ try_prio(const char *prio, unsigned expected_cs, unsigned expected_ciphers) fprintf(stderr, "%s\n", gnutls_cipher_get_name(t[i])); #endif - fail("%s: expected %d ciphers, found %d\n", prio, expected_ciphers, + fail("%s:%d: expected %d ciphers, found %d\n", prio, line, expected_ciphers, ret); exit(1); } @@ -92,7 +92,7 @@ try_prio(const char *prio, unsigned expected_cs, unsigned expected_ciphers) success("finished: %s\n", prio); if (count != expected_cs) { - fail("%s: expected %d ciphersuites, found %d\n", prio, expected_cs, + fail("%s:%d: expected %d ciphersuites, found %d\n", prio, line, expected_cs, count); exit(1); } @@ -100,22 +100,22 @@ try_prio(const char *prio, unsigned expected_cs, unsigned expected_ciphers) void doit(void) { - const int normal = 72; + const int normal = 67; const int null = 5; const int sec128 = 62; - try_prio("NORMAL", normal, 12); - try_prio("NORMAL:-MAC-ALL:+MD5:+MAC-ALL", normal, 12); - try_prio("NORMAL:+CIPHER-ALL", normal, 12); /* all (except null) */ - try_prio("NORMAL:-CIPHER-ALL:+NULL", null, 1); /* null */ - try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL", normal + null, 13); /* 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, 12); - try_prio("SECURE256", 23, 5); - try_prio("SECURE128", sec128, 10); - try_prio("SECURE128:+SECURE256", sec128, 10); /* should be the same as SECURE128 */ - try_prio("SECURE128:+SECURE256:+NORMAL", normal, 12); /* should be the same as NORMAL */ - try_prio("SUITEB192", 1, 1); + try_prio("NORMAL", normal, 11, __LINE__); + try_prio("NORMAL:-MAC-ALL:+MD5:+MAC-ALL", normal, 11, __LINE__); + 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, 12, __LINE__); /* should be null + all */ + try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL:-CIPHER-ALL:+AES-128-CBC", 10, 1, __LINE__); /* should be null + all */ + try_prio("PERFORMANCE", normal, 11, __LINE__); + try_prio("SECURE256", 23, 5, __LINE__); + try_prio("SECURE128", sec128, 10, __LINE__); + try_prio("SECURE128:+SECURE256", sec128, 10, __LINE__); /* should be the same as SECURE128 */ + try_prio("SECURE128:+SECURE256:+NORMAL", normal, 11, __LINE__); /* should be the same as NORMAL */ + try_prio("SUITEB192", 1, 1, __LINE__); } #endif 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); |