diff options
Diffstat (limited to 'tests/tls-session-ext-register.c')
| -rw-r--r-- | tests/tls-session-ext-register.c | 135 |
1 files changed, 61 insertions, 74 deletions
diff --git a/tests/tls-session-ext-register.c b/tests/tls-session-ext-register.c index 3aefbafe1d..e739bdda5d 100644 --- a/tests/tls-session-ext-register.c +++ b/tests/tls-session-ext-register.c @@ -23,7 +23,7 @@ * at the session level */ #ifdef HAVE_CONFIG_H -# include <config.h> +#include <config.h> #endif #include <stdio.h> @@ -39,19 +39,19 @@ int main(int argc, char **argv) #else -# include <string.h> -# include <sys/types.h> -# include <sys/socket.h> -# if !defined(_WIN32) -# include <sys/wait.h> -# include <signal.h> -# endif -# include <unistd.h> -# include <gnutls/gnutls.h> -# include <assert.h> +#include <string.h> +#include <sys/types.h> +#include <sys/socket.h> +#if !defined(_WIN32) +#include <sys/wait.h> +#include <signal.h> +#endif +#include <unistd.h> +#include <gnutls/gnutls.h> +#include <assert.h> -# include "utils.h" -# include "cert-common.h" +#include "utils.h" +#include "cert-common.h" const char *side = ""; @@ -60,8 +60,8 @@ static void tls_log_func(int level, const char *str) fprintf(stderr, "%s|<%d>| %s", side, level, str); } -# define TLSEXT_TYPE_SAMPLE 0xF1 -# define TLSEXT_TYPE_IGN 0xF2 +#define TLSEXT_TYPE_SAMPLE 0xF1 +#define TLSEXT_TYPE_IGN 0xF2 static int TLSEXT_TYPE_client_sent = 0; static int TLSEXT_TYPE_client_received = 0; @@ -78,13 +78,9 @@ static void reset_vars(void) ign_extension_called = 0; } -static const unsigned char ext_data[] = { - 0xFE, - 0xED -}; +static const unsigned char ext_data[] = { 0xFE, 0xED }; -# define myfail(fmt, ...) \ - fail("%s: "fmt, name, ##__VA_ARGS__) +#define myfail(fmt, ...) fail("%s: " fmt, name, ##__VA_ARGS__) static int ext_recv_client_params(gnutls_session_t session, const unsigned char *buf, size_t buflen) @@ -102,7 +98,7 @@ static int ext_recv_client_params(gnutls_session_t session, gnutls_ext_set_data(session, TLSEXT_TYPE_SAMPLE, session); - return 0; //Success + return 0; //Success } static int ext_send_client_params(gnutls_session_t session, @@ -141,7 +137,7 @@ static int ext_recv_server_params(gnutls_session_t session, TLSEXT_TYPE_server_received = 1; - return 0; //Success + return 0; //Success } static int ext_send_server_params(gnutls_session_t session, @@ -180,35 +176,31 @@ static void client(int sd, const char *name, const char *prio, unsigned flags, gnutls_transport_set_int(session, sd); gnutls_handshake_set_timeout(session, get_timeout()); - ret = - gnutls_session_ext_register(session, "ext_ign", TLSEXT_TYPE_IGN, - GNUTLS_EXT_TLS, - ext_recv_client_ign_params, - ext_send_client_ign_params, NULL, NULL, - NULL, flags); + ret = gnutls_session_ext_register(session, "ext_ign", TLSEXT_TYPE_IGN, + GNUTLS_EXT_TLS, + ext_recv_client_ign_params, + ext_send_client_ign_params, NULL, + NULL, NULL, flags); if (ret < 0) myfail("client: register extension\n"); ext_name = - gnutls_ext_get_name2(session, TLSEXT_TYPE_IGN, GNUTLS_EXT_ANY); + gnutls_ext_get_name2(session, TLSEXT_TYPE_IGN, GNUTLS_EXT_ANY); if (ext_name == NULL || strcmp(ext_name, "ext_ign")) myfail("client: retrieve name of extension %u\n", TLSEXT_TYPE_IGN); - ext_name = - gnutls_ext_get_name2(session, TLSEXT_TYPE_IGN, - GNUTLS_EXT_APPLICATION); + ext_name = gnutls_ext_get_name2(session, TLSEXT_TYPE_IGN, + GNUTLS_EXT_APPLICATION); if (ext_name) - myfail - ("client: retrieve name of extension %u (expected none)\n", - TLSEXT_TYPE_IGN); - - ret = - gnutls_session_ext_register(session, "ext_client", - TLSEXT_TYPE_SAMPLE, GNUTLS_EXT_TLS, - ext_recv_client_params, - ext_send_client_params, NULL, NULL, - NULL, flags); + myfail("client: retrieve name of extension %u (expected none)\n", + TLSEXT_TYPE_IGN); + + ret = gnutls_session_ext_register(session, "ext_client", + TLSEXT_TYPE_SAMPLE, GNUTLS_EXT_TLS, + ext_recv_client_params, + ext_send_client_params, NULL, NULL, + NULL, flags); if (ret < 0) myfail("client: register extension\n"); @@ -219,9 +211,8 @@ static void client(int sd, const char *name, const char *prio, unsigned flags, if (ret < 0) { if (!expected_ok) { if (debug) - success - ("client: handshake failed as expected: %s\n", - gnutls_strerror(ret)); + success("client: handshake failed as expected: %s\n", + gnutls_strerror(ret)); } else { myfail("client: Handshake failed: %s\n", gnutls_strerror(ret)); @@ -234,8 +225,7 @@ static void client(int sd, const char *name, const char *prio, unsigned flags, if (TLSEXT_TYPE_client_sent != 1 || TLSEXT_TYPE_client_received != 1) { if (expected_ok) { - myfail - ("client: extension not properly sent/received\n"); + myfail("client: extension not properly sent/received\n"); } else { goto end; } @@ -259,7 +249,7 @@ static void client(int sd, const char *name, const char *prio, unsigned flags, if (!expected_ok) myfail("client: expected failure but succeeded!\n"); - end: +end: close(sd); gnutls_deinit(session); @@ -277,8 +267,8 @@ static void server(int sd, const char *name, const char *prio, unsigned flags, side = "server"; assert(gnutls_certificate_allocate_credentials(&serverx509cred) >= 0); - assert(gnutls_certificate_set_x509_key_mem(serverx509cred, - &server_cert, &server_key, + assert(gnutls_certificate_set_x509_key_mem(serverx509cred, &server_cert, + &server_key, GNUTLS_X509_FMT_PEM) >= 0); assert(gnutls_init(&session, GNUTLS_SERVER) >= 0); @@ -291,10 +281,10 @@ static void server(int sd, const char *name, const char *prio, unsigned flags, gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, serverx509cred); - assert(gnutls_session_ext_register - (session, "ext_server", TLSEXT_TYPE_SAMPLE, GNUTLS_EXT_TLS, - ext_recv_server_params, ext_send_server_params, NULL, NULL, - NULL, flags) >= 0); + assert(gnutls_session_ext_register( + session, "ext_server", TLSEXT_TYPE_SAMPLE, + GNUTLS_EXT_TLS, ext_recv_server_params, + ext_send_server_params, NULL, NULL, NULL, flags) >= 0); gnutls_transport_set_int(session, sd); gnutls_handshake_set_timeout(session, get_timeout()); @@ -303,9 +293,8 @@ static void server(int sd, const char *name, const char *prio, unsigned flags, if (ret < 0) { if (!expected_ok) { if (debug) - success - ("server: handshake failed as expected: %s\n", - gnutls_strerror(ret)); + success("server: handshake failed as expected: %s\n", + gnutls_strerror(ret)); goto cleanup; } else { close(sd); @@ -320,8 +309,7 @@ static void server(int sd, const char *name, const char *prio, unsigned flags, if (TLSEXT_TYPE_server_sent != 1 || TLSEXT_TYPE_server_received != 1) { if (expected_ok) - myfail - ("server: extension not properly sent/received\n"); + myfail("server: extension not properly sent/received\n"); else goto cleanup; } @@ -333,7 +321,7 @@ static void server(int sd, const char *name, const char *prio, unsigned flags, if (!expected_ok) myfail("server: expected failure but succeeded!\n"); - cleanup: +cleanup: close(sd); gnutls_deinit(session); @@ -343,7 +331,7 @@ static void server(int sd, const char *name, const char *prio, unsigned flags, success("server: finished\n"); } -# define try_common(name, prio, flags, sok, cok) \ +#define try_common(name, prio, flags, sok, cok) \ try(name, prio, flags, flags, sok, cok) static void try(const char *name, const char *prio, unsigned server_flags, @@ -404,7 +392,8 @@ void doit(void) try_common("TLS1.2 both ways", "NORMAL:+ANON-ECDH:-VERS-TLS-ALL:+VERS-TLS1.2", GNUTLS_EXT_FLAG_CLIENT_HELLO | - GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO, 1, 1); + GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO, + 1, 1); try_common("TLS1.2 client only", "NORMAL:+ANON-ECDH:-VERS-TLS-ALL:+VERS-TLS1.2", @@ -412,7 +401,8 @@ void doit(void) try_common("TLS1.2 client and TLS 1.3 server", "NORMAL:+ANON-ECDH:-VERS-TLS-ALL:+VERS-TLS1.2", GNUTLS_EXT_FLAG_CLIENT_HELLO | - GNUTLS_EXT_FLAG_TLS13_SERVER_HELLO, 0, 0); + GNUTLS_EXT_FLAG_TLS13_SERVER_HELLO, + 0, 0); try_common("TLS1.2 server only", "NORMAL:+ANON-ECDH:-VERS-TLS-ALL:+VERS-TLS1.2", GNUTLS_EXT_FLAG_TLS12_SERVER_HELLO, 0, 0); @@ -429,16 +419,13 @@ void doit(void) /* check whether we can crash the library by adding many extensions */ success("Testing: register many global extensions\n"); for (i = 0; i < 64; i++) { - ret = - gnutls_ext_register("ext_serverxx", - TLSEXT_TYPE_SAMPLE + i + 1, - GNUTLS_EXT_TLS, ext_recv_server_params, - ext_send_server_params, NULL, NULL, - NULL); + ret = gnutls_ext_register( + "ext_serverxx", TLSEXT_TYPE_SAMPLE + i + 1, + GNUTLS_EXT_TLS, ext_recv_server_params, + ext_send_server_params, NULL, NULL, NULL); if (ret < 0) { - success - ("failed registering extension no %d (expected)\n", - i + 1); + success("failed registering extension no %d (expected)\n", + i + 1); break; } } @@ -446,4 +433,4 @@ void doit(void) gnutls_global_deinit(); } -#endif /* _WIN32 */ +#endif /* _WIN32 */ |