diff options
Diffstat (limited to 'tests/rehandshake-ext-secret.c')
| -rw-r--r-- | tests/rehandshake-ext-secret.c | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/tests/rehandshake-ext-secret.c b/tests/rehandshake-ext-secret.c index 8de2b8fbbb..cdb8f5e838 100644 --- a/tests/rehandshake-ext-secret.c +++ b/tests/rehandshake-ext-secret.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <stdio.h> @@ -69,9 +69,9 @@ static void try(unsigned onclient) &server_cert, &server_key, GNUTLS_X509_FMT_PEM); gnutls_init(&server, GNUTLS_SERVER); - gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE, - serverx509cred); - gnutls_priority_set_direct(server, "NORMAL:-VERS-ALL:+VERS-TLS1.2", NULL); + gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE, serverx509cred); + gnutls_priority_set_direct(server, "NORMAL:-VERS-ALL:+VERS-TLS1.2", + NULL); gnutls_transport_set_push_function(server, server_push); gnutls_transport_set_pull_function(server, server_pull); gnutls_transport_set_ptr(server, server); @@ -79,9 +79,9 @@ static void try(unsigned onclient) /* Init client */ gnutls_certificate_allocate_credentials(&clientx509cred); gnutls_init(&client, GNUTLS_CLIENT); - gnutls_credentials_set(client, GNUTLS_CRD_CERTIFICATE, - clientx509cred); - gnutls_priority_set_direct(client, "NORMAL:-VERS-ALL:+VERS-TLS1.2", NULL); + gnutls_credentials_set(client, GNUTLS_CRD_CERTIFICATE, clientx509cred); + gnutls_priority_set_direct(client, "NORMAL:-VERS-ALL:+VERS-TLS1.2", + NULL); gnutls_transport_set_push_function(client, client_push); gnutls_transport_set_pull_function(client, client_pull); gnutls_transport_set_ptr(client, client); @@ -89,25 +89,35 @@ static void try(unsigned onclient) HANDSHAKE(client, server); if (gnutls_session_ext_master_secret_status(server) == 0) { - fail("%d: ext master secret was not detected by server\n", onclient); + fail("%d: ext master secret was not detected by server\n", + onclient); } if (gnutls_session_ext_master_secret_status(client) == 0) { - fail("%d: ext master secret was not detected by client\n", onclient); + fail("%d: ext master secret was not detected by client\n", + onclient); } - if ((gnutls_session_get_flags(server) & GNUTLS_SFLAGS_EXT_MASTER_SECRET) == 0) { - fail("%d: ext master secret was not detected by server\n", onclient); + if ((gnutls_session_get_flags(server) & GNUTLS_SFLAGS_EXT_MASTER_SECRET) + == 0) { + fail("%d: ext master secret was not detected by server\n", + onclient); } - if ((gnutls_session_get_flags(client) & GNUTLS_SFLAGS_EXT_MASTER_SECRET) == 0) { - fail("%d: ext master secret was not detected by client\n", onclient); + if ((gnutls_session_get_flags(client) & GNUTLS_SFLAGS_EXT_MASTER_SECRET) + == 0) { + fail("%d: ext master secret was not detected by client\n", + onclient); } if (onclient) - gnutls_priority_set_direct(client, "NORMAL:-VERS-ALL:+VERS-TLS1.2:%NO_SESSION_HASH", NULL); + gnutls_priority_set_direct(client, + "NORMAL:-VERS-ALL:+VERS-TLS1.2:%NO_SESSION_HASH", + NULL); else - gnutls_priority_set_direct(server, "NORMAL:-VERS-ALL:+VERS-TLS1.2:%NO_SESSION_HASH", NULL); + gnutls_priority_set_direct(server, + "NORMAL:-VERS-ALL:+VERS-TLS1.2:%NO_SESSION_HASH", + NULL); sret = gnutls_rehandshake(server); if (debug) { @@ -125,9 +135,11 @@ static void try(unsigned onclient) } if (onclient) { - HANDSHAKE_EXPECT(client, server, GNUTLS_E_AGAIN, GNUTLS_E_DECRYPTION_FAILED); + HANDSHAKE_EXPECT(client, server, GNUTLS_E_AGAIN, + GNUTLS_E_DECRYPTION_FAILED); } else { - HANDSHAKE_EXPECT(client, server, GNUTLS_E_AGAIN, GNUTLS_E_DECRYPTION_FAILED); + HANDSHAKE_EXPECT(client, server, GNUTLS_E_AGAIN, + GNUTLS_E_DECRYPTION_FAILED); } gnutls_deinit(client); |