summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2017-09-11 11:33:31 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2018-02-19 15:29:33 +0100
commit6435ad8b9a2a59ae0b6698231bd02b2bf7e1002d (patch)
tree1c52dde4407f5cd6d0e7c249ca77901cc68a704e
parent30c1855c060de476e9463421791db9e013a780b1 (diff)
downloadgnutls-6435ad8b9a2a59ae0b6698231bd02b2bf7e1002d.tar.gz
tests: fix TLS version to 1.2 for tests which used VERS-TLS-ALL
This allows the test suite to run, even when TLS1.3 is still experimental. Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r--tests/anonself.c4
-rw-r--r--tests/mini-eagain.c4
-rw-r--r--tests/record-sizes-range.c4
-rw-r--r--tests/record-sizes.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/anonself.c b/tests/anonself.c
index 0ad4136e98..074ef78d5e 100644
--- a/tests/anonself.c
+++ b/tests/anonself.c
@@ -85,7 +85,7 @@ static void client(int sd)
/* Use default priorities */
gnutls_priority_set_direct(session,
- "NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH",
+ "NONE:+VERS-TLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH",
NULL);
/* put the anonymous credentials to the current session
@@ -177,7 +177,7 @@ static gnutls_session_t initialize_tls_session(void)
* are adequate.
*/
gnutls_priority_set_direct(session,
- "NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH",
+ "NONE:+VERS-TLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH",
NULL);
gnutls_handshake_set_timeout(session, 20 * 1000);
diff --git a/tests/mini-eagain.c b/tests/mini-eagain.c
index f74092d058..124b535103 100644
--- a/tests/mini-eagain.c
+++ b/tests/mini-eagain.c
@@ -78,7 +78,7 @@ void doit(void)
gnutls_init(&server, GNUTLS_SERVER);
ret =
gnutls_priority_set_direct(server,
- "NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH",
+ "NONE:+VERS-TLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH",
NULL);
if (ret < 0)
exit(1);
@@ -92,7 +92,7 @@ void doit(void)
gnutls_init(&client, GNUTLS_CLIENT);
ret =
gnutls_priority_set_direct(client,
- "NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH",
+ "NONE:+VERS-TLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH",
NULL);
if (ret < 0)
exit(1);
diff --git a/tests/record-sizes-range.c b/tests/record-sizes-range.c
index b4f2825fa0..56e1b6cf34 100644
--- a/tests/record-sizes-range.c
+++ b/tests/record-sizes-range.c
@@ -116,7 +116,7 @@ void doit(void)
gnutls_anon_set_server_dh_params(s_anoncred, dh_params);
gnutls_init(&server, GNUTLS_SERVER);
gnutls_priority_set_direct(server,
- "NONE:+VERS-TLS-ALL:+AES-128-CBC:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-DH",
+ "NONE:+VERS-TLS1.2:+AES-128-CBC:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-DH",
NULL);
gnutls_credentials_set(server, GNUTLS_CRD_ANON, s_anoncred);
gnutls_transport_set_push_function(server, server_push);
@@ -127,7 +127,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-TLS1.2:+CIPHER-ALL:+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);
diff --git a/tests/record-sizes.c b/tests/record-sizes.c
index b1628041da..7e8efbc756 100644
--- a/tests/record-sizes.c
+++ b/tests/record-sizes.c
@@ -81,7 +81,7 @@ void doit(void)
gnutls_anon_set_server_dh_params(s_anoncred, dh_params);
gnutls_init(&server, GNUTLS_SERVER);
gnutls_priority_set_direct(server,
- "NONE:+VERS-TLS-ALL:+ARCFOUR-128:+MD5:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-DH",
+ "NONE:+VERS-TLS1.2:+ARCFOUR-128:+MD5:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-DH",
NULL);
gnutls_credentials_set(server, GNUTLS_CRD_ANON, s_anoncred);
gnutls_transport_set_push_function(server, server_push);
@@ -92,7 +92,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:+ARCFOUR-128:+MD5:+MAC-ALL:+SIGN-ALL:+COMP-NULL:+ANON-DH",
+ "NONE:+VERS-TLS1.2:+CIPHER-ALL:+ARCFOUR-128:+MD5:+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);