diff options
Diffstat (limited to 'tests/custom-urls-override.c')
| -rw-r--r-- | tests/custom-urls-override.c | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/tests/custom-urls-override.c b/tests/custom-urls-override.c index a741c411df..aa3de7bdad 100644 --- a/tests/custom-urls-override.c +++ b/tests/custom-urls-override.c @@ -20,7 +20,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <stdio.h> @@ -35,21 +35,21 @@ 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/abstract.h> -#include <gnutls/urls.h> -#include <signal.h> -#include <assert.h> -#include "cert-common.h" - -#include "utils.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/abstract.h> +# include <gnutls/urls.h> +# include <signal.h> +# include <assert.h> +# include "cert-common.h" + +# include "utils.h" static void terminate(void); static unsigned url_used = 0; @@ -62,17 +62,20 @@ static void server_log_func(int level, const char *str) fprintf(stderr, "server|<%d>| %s", level, str); } -static int url_import_key(gnutls_privkey_t pkey, const char *url, unsigned flags) +static int url_import_key(gnutls_privkey_t pkey, const char *url, + unsigned flags) { if (strcmp(url, "system:key") != 0) { fail("unexpected key url: %s\n", url); return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE; } url_used++; - return gnutls_privkey_import_x509_raw(pkey, &server_key, GNUTLS_X509_FMT_PEM, NULL, 0); + return gnutls_privkey_import_x509_raw(pkey, &server_key, + GNUTLS_X509_FMT_PEM, NULL, 0); } -static int url_import_crt(gnutls_x509_crt_t crt, const char *url, unsigned flags) +static int url_import_crt(gnutls_x509_crt_t crt, const char *url, + unsigned flags) { if (strcmp(url, "system:cert") != 0) { abort(); @@ -96,7 +99,8 @@ static void client(int fd) gnutls_init(&session, GNUTLS_CLIENT); /* Use default priorities */ - assert(gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.2", NULL)>=0); + assert(gnutls_priority_set_direct + (session, "NORMAL:-VERS-ALL:+VERS-TLS1.2", NULL) >= 0); gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); @@ -154,8 +158,10 @@ static void server(int fd) */ gnutls_certificate_allocate_credentials(&x509_cred); - ret = gnutls_certificate_set_x509_key_file(x509_cred, "system:cert", "system:key", - GNUTLS_X509_FMT_PEM); + ret = + gnutls_certificate_set_x509_key_file(x509_cred, "system:cert", + "system:key", + GNUTLS_X509_FMT_PEM); if (ret < 0) { fail("server: gnutls_certificate_set_x509_key_file (%s)\n\n", gnutls_strerror(ret)); @@ -167,7 +173,8 @@ static void server(int fd) /* avoid calling all the priority functions, since the defaults * are adequate. */ - assert(gnutls_priority_set_direct(session, "NORMAL:-VERS-ALL:+VERS-TLS1.2", NULL)>=0); + assert(gnutls_priority_set_direct + (session, "NORMAL:-VERS-ALL:+VERS-TLS1.2", NULL) >= 0); gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); @@ -214,7 +221,7 @@ static void server(int fd) const gnutls_custom_url_st custom_url_st = { .name = "system:", - .name_size = sizeof("system:")-1, + .name_size = sizeof("system:") - 1, .import_key = url_import_key, .import_crt = url_import_crt }; |