diff options
Diffstat (limited to 'tests/dtls-rehandshake-cert.c')
| -rw-r--r-- | tests/dtls-rehandshake-cert.c | 80 |
1 files changed, 34 insertions, 46 deletions
diff --git a/tests/dtls-rehandshake-cert.c b/tests/dtls-rehandshake-cert.c index 9deccc9091..cc29950a6c 100644 --- a/tests/dtls-rehandshake-cert.c +++ b/tests/dtls-rehandshake-cert.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <stdio.h> @@ -35,19 +35,19 @@ int main(void) #else -#include <string.h> -#include <sys/types.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <sys/wait.h> -#include <arpa/inet.h> -#include <unistd.h> -#include <gnutls/gnutls.h> -#include <gnutls/dtls.h> -#include <assert.h> +# include <string.h> +# include <sys/types.h> +# include <netinet/in.h> +# include <sys/socket.h> +# include <sys/wait.h> +# include <arpa/inet.h> +# include <unistd.h> +# include <gnutls/gnutls.h> +# include <gnutls/dtls.h> +# include <assert.h> -#include "cert-common.h" -#include "utils.h" +# include "cert-common.h" +# include "utils.h" static void terminate(void); @@ -68,13 +68,12 @@ static void client_log_func(int level, const char *str) * certificates. */ -#define MAX_BUF 1024 -#define MSG "Hello TLS" +# define MAX_BUF 1024 +# define MSG "Hello TLS" -static ssize_t -push(gnutls_transport_ptr_t tr, const void *data, size_t len) +static ssize_t push(gnutls_transport_ptr_t tr, const void *data, size_t len) { - int fd = (long int) tr; + int fd = (long int)tr; return send(fd, data, len, 0); } @@ -102,12 +101,9 @@ static void client(int fd, int server_init, const char *prio) /* Use default priorities */ snprintf(buffer, sizeof(buffer), "%s:+ECDHE-RSA", prio); - assert(gnutls_priority_set_direct(session, - buffer, - NULL) >= 0); + assert(gnutls_priority_set_direct(session, buffer, NULL) >= 0); - gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, - clientx509cred); + gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, clientx509cred); gnutls_transport_set_int(session, fd); gnutls_transport_set_push_function(session, push); @@ -150,14 +146,12 @@ static void client(int fd, int server_init, const char *prio) } else { do { ret = gnutls_record_recv(session, buffer, MAX_BUF); - } while (ret == GNUTLS_E_AGAIN - || ret == GNUTLS_E_INTERRUPTED); + } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); } if (ret == 0) { if (debug) - success - ("client: Peer has closed the TLS connection\n"); + success("client: Peer has closed the TLS connection\n"); goto end; } else if (ret < 0) { if (server_init && ret == GNUTLS_E_REHANDSHAKE) { @@ -181,7 +175,7 @@ static void client(int fd, int server_init, const char *prio) } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); gnutls_bye(session, GNUTLS_SHUT_WR); - end: + end: close(fd); @@ -192,11 +186,9 @@ static void client(int fd, int server_init, const char *prio) gnutls_global_deinit(); } - /* These are global */ pid_t child; - static void terminate(void) { int status; @@ -223,8 +215,8 @@ static void server(int fd, int server_init, const char *prio) assert(gnutls_certificate_allocate_credentials(&serverx509cred) >= 0); assert(gnutls_certificate_set_x509_key_mem(serverx509cred, - &server_cert, &server_key, - GNUTLS_X509_FMT_PEM) >= 0); + &server_cert, &server_key, + GNUTLS_X509_FMT_PEM) >= 0); gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM); gnutls_dtls_set_mtu(session, 1500); @@ -233,12 +225,9 @@ static void server(int fd, int server_init, const char *prio) * are adequate. */ snprintf(buffer, sizeof(buffer), "%s:+ECDHE-RSA", prio); - assert(gnutls_priority_set_direct(session, - buffer, - NULL) >= 0); + assert(gnutls_priority_set_direct(session, buffer, NULL) >= 0); - gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, - serverx509cred); + gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, serverx509cred); gnutls_transport_set_int(session, fd); gnutls_transport_set_push_function(session, push); @@ -270,8 +259,7 @@ static void server(int fd, int server_init, const char *prio) success("server: Sending dummy packet\n"); ret = gnutls_rehandshake(session); if (ret < 0) { - fail("gnutls_rehandshake: %s\n", - gnutls_strerror(ret)); + fail("gnutls_rehandshake: %s\n", gnutls_strerror(ret)); terminate(); } @@ -294,8 +282,7 @@ static void server(int fd, int server_init, const char *prio) do { ret = gnutls_record_recv(session, buffer, MAX_BUF); - } while (ret == GNUTLS_E_AGAIN - || ret == GNUTLS_E_INTERRUPTED); + } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); if (ret == 0) { if (debug) @@ -311,7 +298,7 @@ static void server(int fd, int server_init, const char *prio) ret = gnutls_handshake(session); } while (ret < 0 - && gnutls_error_is_fatal(ret) == 0); + && gnutls_error_is_fatal(ret) == 0); if (ret == 0) break; } @@ -324,13 +311,12 @@ static void server(int fd, int server_init, const char *prio) do { ret = gnutls_record_send(session, buffer, - strlen(buffer)); + strlen(buffer)); } while (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); } } - /* do not wait for the peer to close the connection. */ gnutls_bye(session, GNUTLS_SHUT_WR); @@ -380,8 +366,10 @@ static void start(int server_initiated, const char *prio) void doit(void) { - start(0, "NONE:+VERS-DTLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+CURVE-ALL"); - start(1, "NONE:+VERS-DTLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+CURVE-ALL"); + start(0, + "NONE:+VERS-DTLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+CURVE-ALL"); + start(1, + "NONE:+VERS-DTLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+CURVE-ALL"); } #endif /* _WIN32 */ |