diff options
Diffstat (limited to 'tests/post-client-hello-change-prio.c')
| -rw-r--r-- | tests/post-client-hello-change-prio.c | 52 |
1 files changed, 30 insertions, 22 deletions
diff --git a/tests/post-client-hello-change-prio.c b/tests/post-client-hello-change-prio.c index e87becc7d8..6999cbe617 100644 --- a/tests/post-client-hello-change-prio.c +++ b/tests/post-client-hello-change-prio.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <stdio.h> @@ -44,7 +44,8 @@ const char *override_prio = NULL; static int post_client_hello_callback(gnutls_session_t session) { if (override_prio) { - assert(gnutls_priority_set_direct(session, override_prio, NULL) >= 0); + assert(gnutls_priority_set_direct(session, override_prio, NULL) + >= 0); } pch_ok = 1; return 0; @@ -56,7 +57,8 @@ static void tls_log_func(int level, const char *str) } static -void start(const char *name, const char *client_prio, const char *server_prio, int expected) +void start(const char *name, const char *client_prio, const char *server_prio, + int expected) { /* Server stuff. */ gnutls_certificate_credentials_t serverx509cred; @@ -78,25 +80,23 @@ void start(const char *name, const char *client_prio, const char *server_prio, i gnutls_global_set_log_level(4); /* Init server */ - assert(gnutls_certificate_allocate_credentials(&serverx509cred)>=0); + assert(gnutls_certificate_allocate_credentials(&serverx509cred) >= 0); assert(gnutls_certificate_set_x509_key_mem(serverx509cred, - &server_cert, &server_key, - GNUTLS_X509_FMT_PEM)>=0); - assert(gnutls_init(&server, GNUTLS_SERVER)>=0); - gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE, - serverx509cred); - assert(gnutls_priority_set_direct(server, server_prio, NULL)>=0); + &server_cert, &server_key, + GNUTLS_X509_FMT_PEM) >= 0); + assert(gnutls_init(&server, GNUTLS_SERVER) >= 0); + gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE, serverx509cred); + assert(gnutls_priority_set_direct(server, server_prio, NULL) >= 0); gnutls_transport_set_push_function(server, server_push); gnutls_transport_set_pull_function(server, server_pull); gnutls_transport_set_ptr(server, server); gnutls_handshake_set_post_client_hello_function(server, post_client_hello_callback); - assert(gnutls_certificate_allocate_credentials(&clientx509cred)>=0); - assert(gnutls_init(&client, GNUTLS_CLIENT)>=0); - gnutls_credentials_set(client, GNUTLS_CRD_CERTIFICATE, - clientx509cred); - assert(gnutls_priority_set_direct(client, client_prio, NULL)>=0); + assert(gnutls_certificate_allocate_credentials(&clientx509cred) >= 0); + assert(gnutls_init(&client, GNUTLS_CLIENT) >= 0); + gnutls_credentials_set(client, GNUTLS_CRD_CERTIFICATE, clientx509cred); + assert(gnutls_priority_set_direct(client, client_prio, NULL) >= 0); gnutls_transport_set_push_function(client, client_push); gnutls_transport_set_pull_function(client, client_pull); gnutls_transport_set_ptr(client, client); @@ -112,7 +112,8 @@ void start(const char *name, const char *client_prio, const char *server_prio, i ret = gnutls_protocol_get_version(server); assert(expected == ret); } else { - HANDSHAKE_EXPECT(client, server, GNUTLS_E_AGAIN, GNUTLS_E_UNSUPPORTED_VERSION_PACKET); + HANDSHAKE_EXPECT(client, server, GNUTLS_E_AGAIN, + GNUTLS_E_UNSUPPORTED_VERSION_PACKET); } gnutls_bye(client, GNUTLS_SHUT_RDWR); @@ -135,15 +136,22 @@ void start(const char *name, const char *client_prio, const char *server_prio, i void doit(void) { override_prio = "NORMAL"; - start("tls1.2-only", "NORMAL:-VERS-ALL:+VERS-TLS1.2", "NORMAL:-VERS-ALL:+VERS-TLS1.2", GNUTLS_TLS1_2); - start("tls1.3-only", "NORMAL:-VERS-ALL:+VERS-TLS1.3", "NORMAL:-VERS-ALL:+VERS-TLS1.3", GNUTLS_TLS1_3); + start("tls1.2-only", "NORMAL:-VERS-ALL:+VERS-TLS1.2", + "NORMAL:-VERS-ALL:+VERS-TLS1.2", GNUTLS_TLS1_2); + start("tls1.3-only", "NORMAL:-VERS-ALL:+VERS-TLS1.3", + "NORMAL:-VERS-ALL:+VERS-TLS1.3", GNUTLS_TLS1_3); start("default", "NORMAL", "NORMAL", GNUTLS_TLS1_3); override_prio = "NORMAL:-VERS-ALL:+VERS-TLS1.2"; - start("default overridden to TLS1.2-only", "NORMAL", "NORMAL", GNUTLS_TLS1_2); + start("default overridden to TLS1.2-only", "NORMAL", "NORMAL", + GNUTLS_TLS1_2); override_prio = NULL; start("client tls1.2-only, server tls1.2-disabled", - "NORMAL:-VERS-ALL:+VERS-TLS1.2", "NORMAL:-VERS-TLS1.2:-VERS-TLS1.1:-VERS-TLS1.0:-VERS-SSL3.0", -1); + "NORMAL:-VERS-ALL:+VERS-TLS1.2", + "NORMAL:-VERS-TLS1.2:-VERS-TLS1.1:-VERS-TLS1.0:-VERS-SSL3.0", -1); override_prio = "NORMAL:-VERS-ALL:+VERS-TLS1.2"; - start("client tls1.2-only, server tls1.2-disabled initially, but allow it afterwards", - "NORMAL:-VERS-ALL:+VERS-TLS1.2", "NORMAL:-VERS-TLS1.2:-VERS-TLS1.1:-VERS-TLS1.0:-VERS-SSL3.0", GNUTLS_TLS1_2); + start + ("client tls1.2-only, server tls1.2-disabled initially, but allow it afterwards", + "NORMAL:-VERS-ALL:+VERS-TLS1.2", + "NORMAL:-VERS-TLS1.2:-VERS-TLS1.1:-VERS-TLS1.0:-VERS-SSL3.0", + GNUTLS_TLS1_2); } |