diff options
Diffstat (limited to 'tests/utils-adv.c')
-rw-r--r-- | tests/utils-adv.c | 106 |
1 files changed, 56 insertions, 50 deletions
diff --git a/tests/utils-adv.c b/tests/utils-adv.c index 25c50b49dc..4f915a919a 100644 --- a/tests/utils-adv.c +++ b/tests/utils-adv.c @@ -21,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include <config.h> +# include <config.h> #endif #include <stdio.h> @@ -43,14 +43,12 @@ const char *side = NULL; /* if @host is NULL certificate check is skipped */ int _test_cli_serv(gnutls_certificate_credentials_t server_cred, - gnutls_certificate_credentials_t client_cred, - const char *serv_prio, const char *cli_prio, - const char *host, - void *priv, callback_func *client_cb, callback_func *server_cb, - unsigned expect_verification_failure, - unsigned require_cert, - int serv_err, - int cli_err) + gnutls_certificate_credentials_t client_cred, + const char *serv_prio, const char *cli_prio, + const char *host, + void *priv, callback_func * client_cb, callback_func * server_cb, + unsigned expect_verification_failure, + unsigned require_cert, int serv_err, int cli_err) { int ret; /* Server stuff. */ @@ -65,8 +63,7 @@ _test_cli_serv(gnutls_certificate_credentials_t server_cred, /* Init server */ gnutls_init(&server, GNUTLS_SERVER); - gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE, - server_cred); + gnutls_credentials_set(server, GNUTLS_CRD_CERTIFICATE, server_cred); ret = gnutls_priority_set_direct(server, serv_prio, NULL); if (ret < 0) { fail("error in server priority: %s\n", serv_prio); @@ -76,7 +73,8 @@ _test_cli_serv(gnutls_certificate_credentials_t server_cred, gnutls_transport_set_ptr(server, server); if (require_cert) - gnutls_certificate_server_set_request(server, GNUTLS_CERT_REQUIRE); + gnutls_certificate_server_set_request(server, + GNUTLS_CERT_REQUIRE); ret = gnutls_init(&client, GNUTLS_CLIENT); if (ret < 0) @@ -84,15 +82,19 @@ _test_cli_serv(gnutls_certificate_credentials_t server_cred, if (host) { if (strncmp(host, "raw:", 4) == 0) { - assert(_gnutls_server_name_set_raw(client, GNUTLS_NAME_DNS, host+4, strlen(host+4))>=0); + assert(_gnutls_server_name_set_raw + (client, GNUTLS_NAME_DNS, host + 4, + strlen(host + 4)) >= 0); host += 4; } else { - assert(gnutls_server_name_set(client, GNUTLS_NAME_DNS, host, strlen(host))>=0); + assert(gnutls_server_name_set + (client, GNUTLS_NAME_DNS, host, + strlen(host)) >= 0); } } ret = gnutls_credentials_set(client, GNUTLS_CRD_CERTIFICATE, - client_cred); + client_cred); if (ret < 0) exit(1); @@ -119,14 +121,15 @@ _test_cli_serv(gnutls_certificate_credentials_t server_cred, memset(data, 0, sizeof(data)); data[0].type = GNUTLS_DT_DNS_HOSTNAME; - data[0].data = (void*)host; + data[0].data = (void *)host; data[1].type = GNUTLS_DT_KEY_PURPOSE_OID; - data[1].data = (void*)GNUTLS_KP_TLS_WWW_SERVER; + data[1].data = (void *)GNUTLS_KP_TLS_WWW_SERVER; ret = gnutls_certificate_verify_peers(client, data, 2, &status); if (ret < 0) { - fail("could not verify certificate: %s\n", gnutls_strerror(ret)); + fail("could not verify certificate: %s\n", + gnutls_strerror(ret)); exit(1); } @@ -139,7 +142,8 @@ _test_cli_serv(gnutls_certificate_credentials_t server_cred, if (status != 0) { gnutls_datum_t t; - assert(gnutls_certificate_verification_status_print(status, GNUTLS_CRT_X509, &t, 0)>=0); + assert(gnutls_certificate_verification_status_print + (status, GNUTLS_CRT_X509, &t, 0) >= 0); fail("could not verify certificate for '%s': %.4x: %s\n", host, status, t.data); gnutls_free(t.data); exit(1); @@ -148,14 +152,17 @@ _test_cli_serv(gnutls_certificate_credentials_t server_cred, /* check gnutls_certificate_verify_peers3 */ ret = gnutls_certificate_verify_peers3(client, host, &status); if (ret < 0) { - fail("could not verify certificate: %s\n", gnutls_strerror(ret)); + fail("could not verify certificate: %s\n", + gnutls_strerror(ret)); exit(1); } if (status != 0) { gnutls_datum_t t; - assert(gnutls_certificate_verification_status_print(status, GNUTLS_CRT_X509, &t, 0)>=0); - fail("could not verify certificate3: %.4x: %s\n", status, t.data); + assert(gnutls_certificate_verification_status_print + (status, GNUTLS_CRT_X509, &t, 0) >= 0); + fail("could not verify certificate3: %.4x: %s\n", + status, t.data); gnutls_free(t.data); exit(1); } @@ -184,15 +191,16 @@ void test_cli_serv(gnutls_certificate_credentials_t server_cred, gnutls_certificate_credentials_t client_cred, const char *prio, const char *host, - void *priv, callback_func *client_cb, callback_func *server_cb) + void *priv, callback_func * client_cb, callback_func * server_cb) { - _test_cli_serv(server_cred, client_cred, prio, prio, host, priv, client_cb, server_cb, 0, 0, 0, 0); + _test_cli_serv(server_cred, client_cred, prio, prio, host, priv, + client_cb, server_cb, 0, 0, 0, 0); } int test_cli_serv_anon(gnutls_anon_server_credentials_t server_cred, - gnutls_anon_client_credentials_t client_cred, - const char *prio) + gnutls_anon_client_credentials_t client_cred, + const char *prio) { int ret; /* Server stuff. */ @@ -207,8 +215,7 @@ test_cli_serv_anon(gnutls_anon_server_credentials_t server_cred, /* Init server */ gnutls_init(&server, GNUTLS_SERVER); - gnutls_credentials_set(server, GNUTLS_CRD_ANON, - server_cred); + gnutls_credentials_set(server, GNUTLS_CRD_ANON, server_cred); gnutls_priority_set_direct(server, prio, NULL); gnutls_transport_set_push_function(server, server_push); gnutls_transport_set_pull_function(server, server_pull); @@ -218,8 +225,7 @@ test_cli_serv_anon(gnutls_anon_server_credentials_t server_cred, if (ret < 0) exit(1); - ret = gnutls_credentials_set(client, GNUTLS_CRD_ANON, - client_cred); + ret = gnutls_credentials_set(client, GNUTLS_CRD_ANON, client_cred); if (ret < 0) exit(1); @@ -243,8 +249,7 @@ test_cli_serv_anon(gnutls_anon_server_credentials_t server_cred, int test_cli_serv_psk(gnutls_psk_server_credentials_t server_cred, - gnutls_psk_client_credentials_t client_cred, - const char *prio) + gnutls_psk_client_credentials_t client_cred, const char *prio) { int ret; /* Server stuff. */ @@ -259,8 +264,7 @@ test_cli_serv_psk(gnutls_psk_server_credentials_t server_cred, /* Init server */ gnutls_init(&server, GNUTLS_SERVER); - gnutls_credentials_set(server, GNUTLS_CRD_PSK, - server_cred); + gnutls_credentials_set(server, GNUTLS_CRD_PSK, server_cred); gnutls_priority_set_direct(server, prio, NULL); gnutls_transport_set_push_function(server, server_push); gnutls_transport_set_pull_function(server, server_pull); @@ -270,8 +274,7 @@ test_cli_serv_psk(gnutls_psk_server_credentials_t server_cred, if (ret < 0) exit(1); - ret = gnutls_credentials_set(client, GNUTLS_CRD_PSK, - client_cred); + ret = gnutls_credentials_set(client, GNUTLS_CRD_PSK, client_cred); if (ret < 0) exit(1); @@ -295,28 +298,32 @@ test_cli_serv_psk(gnutls_psk_server_credentials_t server_cred, void test_cli_serv_cert(gnutls_certificate_credentials_t server_cred, - gnutls_certificate_credentials_t client_cred, - const char *serv_prio, const char *cli_prio, const char *host) + gnutls_certificate_credentials_t client_cred, + const char *serv_prio, const char *cli_prio, + const char *host) { - _test_cli_serv(server_cred, client_cred, serv_prio, cli_prio, host, NULL, NULL, NULL, 0, 1, 0, 0); + _test_cli_serv(server_cred, client_cred, serv_prio, cli_prio, host, + NULL, NULL, NULL, 0, 1, 0, 0); } void test_cli_serv_expect(gnutls_certificate_credentials_t server_cred, - gnutls_certificate_credentials_t client_cred, - const char *serv_prio, const char *cli_prio, const char *host, - int serv_err, int cli_err) + gnutls_certificate_credentials_t client_cred, + const char *serv_prio, const char *cli_prio, + const char *host, int serv_err, int cli_err) { - _test_cli_serv(server_cred, client_cred, serv_prio, cli_prio, host, NULL, NULL, NULL, 0, 0, serv_err, cli_err); + _test_cli_serv(server_cred, client_cred, serv_prio, cli_prio, host, + NULL, NULL, NULL, 0, 0, serv_err, cli_err); } /* An expected to fail verification run. Returns verification status */ unsigned test_cli_serv_vf(gnutls_certificate_credentials_t server_cred, - gnutls_certificate_credentials_t client_cred, - const char *prio, const char *host) + gnutls_certificate_credentials_t client_cred, + const char *prio, const char *host) { - return _test_cli_serv(server_cred, client_cred, prio, prio, host, NULL, NULL, NULL, 1, 0, 0, 0); + return _test_cli_serv(server_cred, client_cred, prio, prio, host, NULL, + NULL, NULL, 1, 0, 0, 0); } void print_dh_params_info(gnutls_session_t session) @@ -345,7 +352,7 @@ void print_dh_params_info(gnutls_session_t session) } printf("pubkey: \n"); - for (i=0;i<pubkey.size;i++) { + for (i = 0; i < pubkey.size; i++) { printf("%.2x", (unsigned)pubkey.data[i]); } printf("\n"); @@ -358,17 +365,16 @@ void print_dh_params_info(gnutls_session_t session) } printf("prime: \n"); - for (i=0;i<prime.size;i++) { + for (i = 0; i < prime.size; i++) { printf("%.2x", (unsigned)prime.data[i]); } printf("\n"); printf("generator: \n"); - for (i=0;i<gen.size;i++) { + for (i = 0; i < gen.size; i++) { printf("%.2x", (unsigned)gen.data[i]); } printf("\n"); gnutls_free(gen.data); gnutls_free(prime.data); } - |