diff options
Diffstat (limited to 'tests/cert-status.c')
| -rw-r--r-- | tests/cert-status.c | 67 |
1 files changed, 33 insertions, 34 deletions
diff --git a/tests/cert-status.c b/tests/cert-status.c index 61d3272f0c..20cb767297 100644 --- a/tests/cert-status.c +++ b/tests/cert-status.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <stdio.h> @@ -35,20 +35,20 @@ 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 <signal.h> - -#include "utils.h" -#include "cert-common.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 <signal.h> + +# include "utils.h" +# include "cert-common.h" /* This program tests whether the GNUTLS_CERT_* flags * work as expected. @@ -64,7 +64,7 @@ static void client_log_func(int level, const char *str) fprintf(stderr, "client|<%d>| %s", level, str); } -#define MAX_BUF 1024 +# define MAX_BUF 1024 static void client(int fd, const char *prio) { @@ -84,9 +84,7 @@ static void client(int fd, const char *prio) gnutls_init(&session, GNUTLS_CLIENT); - ret = - gnutls_priority_set_direct(session, - prio, &p); + ret = gnutls_priority_set_direct(session, prio, &p); if (ret < 0) { fail("error in setting priority: %s\n", p); exit(1); @@ -128,7 +126,6 @@ static void client(int fd, const char *prio) gnutls_global_deinit(); } - static void server(int fd, const char *prio, unsigned status, int expected) { int ret; @@ -143,8 +140,7 @@ static void server(int fd, const char *prio, unsigned status, int expected) gnutls_init(&session, GNUTLS_SERVER); - assert(gnutls_priority_set_direct(session, - prio, NULL)>=0); + assert(gnutls_priority_set_direct(session, prio, NULL) >= 0); if (debug) { gnutls_global_set_log_function(server_log_func); @@ -153,8 +149,7 @@ static void server(int fd, const char *prio, unsigned status, int expected) gnutls_certificate_allocate_credentials(&x509_cred); gnutls_certificate_set_x509_key_mem(x509_cred, &server_cert, - &server_key, - GNUTLS_X509_FMT_PEM); + &server_key, GNUTLS_X509_FMT_PEM); gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); @@ -169,11 +164,11 @@ static void server(int fd, const char *prio, unsigned status, int expected) if (ret == expected) { if (debug) success - ("server: Handshake finished as expected (%d)\n", ret); + ("server: Handshake finished as expected (%d)\n", + ret); goto finish; } else { - fail("expected %d, handshake returned %d\n", expected, - ret); + fail("expected %d, handshake returned %d\n", expected, ret); } if (debug) @@ -183,7 +178,7 @@ static void server(int fd, const char *prio, unsigned status, int expected) success("server: TLS version is: %s\n", gnutls_protocol_get_name (gnutls_protocol_get_version(session))); - finish: + finish: close(fd); gnutls_deinit(session); @@ -235,23 +230,27 @@ static void ch_handler(int sig) return; } - void doit(void) { signal(SIGCHLD, ch_handler); signal(SIGPIPE, SIG_IGN); - start("NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA", GNUTLS_CERT_IGNORE, 0); - start("NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA", GNUTLS_CERT_REQUEST, 0); - start("NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA", GNUTLS_CERT_REQUIRE, GNUTLS_E_NO_CERTIFICATE_FOUND); + start("NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA", + GNUTLS_CERT_IGNORE, 0); + start("NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA", + GNUTLS_CERT_REQUEST, 0); + start("NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-NULL:+RSA", + GNUTLS_CERT_REQUIRE, GNUTLS_E_NO_CERTIFICATE_FOUND); start("NORMAL:-VERS-ALL:+VERS-TLS1.2", GNUTLS_CERT_IGNORE, 0); start("NORMAL:-VERS-ALL:+VERS-TLS1.2", GNUTLS_CERT_REQUEST, 0); - start("NORMAL:-VERS-ALL:+VERS-TLS1.2", GNUTLS_CERT_REQUIRE, GNUTLS_E_NO_CERTIFICATE_FOUND); + start("NORMAL:-VERS-ALL:+VERS-TLS1.2", GNUTLS_CERT_REQUIRE, + GNUTLS_E_NO_CERTIFICATE_FOUND); start("NORMAL:-VERS-ALL:+VERS-TLS1.3", GNUTLS_CERT_IGNORE, 0); start("NORMAL:-VERS-ALL:+VERS-TLS1.3", GNUTLS_CERT_REQUEST, 0); - start("NORMAL:-VERS-ALL:+VERS-TLS1.3", GNUTLS_CERT_REQUIRE, GNUTLS_E_CERTIFICATE_REQUIRED); + start("NORMAL:-VERS-ALL:+VERS-TLS1.3", GNUTLS_CERT_REQUIRE, + GNUTLS_E_CERTIFICATE_REQUIRED); start("NORMAL", GNUTLS_CERT_IGNORE, 0); start("NORMAL", GNUTLS_CERT_REQUEST, 0); |