diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-10-11 19:25:52 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-10-14 22:55:38 +0200 |
commit | 4c04aa36cbb5255173e0516b32cb3d07d03b502c (patch) | |
tree | 0957b06d8592ff9117f94ce1c956b17ce0da4a61 | |
parent | 7fc0963d81971f8eaae6d99d6933aca9a7e50599 (diff) | |
download | gnutls-4c04aa36cbb5255173e0516b32cb3d07d03b502c.tar.gz |
tests: check gnutls_psk_set_server_known_dh_params
-rw-r--r-- | tests/Makefile.am | 2 | ||||
-rw-r--r-- | tests/set_known_dh_params_psk.c | 112 | ||||
-rw-r--r-- | tests/utils-adv.c | 60 | ||||
-rw-r--r-- | tests/utils.h | 5 |
4 files changed, 178 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 65b426c07e..d5fb1b42b2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -115,7 +115,7 @@ ctests = mini-record-2 simple gc set_pkcs12_cred certder certuniqueid \ set_key_utf8 set_x509_key_utf8 insecure_key handshake-large-packet \ client_dsa_key server_ecdsa_key tls-session-ext-register tls-session-supplemental \ multi-alerts naked-alerts pkcs7-cat-parse set_known_dh_params_x509 \ - set_known_dh_params_anon + set_known_dh_params_anon set_known_dh_params_psk if HAVE_SECCOMP_TESTS ctests += dtls-with-seccomp tls-with-seccomp dtls-client-with-seccomp tls-client-with-seccomp diff --git a/tests/set_known_dh_params_psk.c b/tests/set_known_dh_params_psk.c new file mode 100644 index 0000000000..c84d36eceb --- /dev/null +++ b/tests/set_known_dh_params_psk.c @@ -0,0 +1,112 @@ +/* + * Copyright (C) 2016 Nikos Mavrogiannopoulos + * + * Author: Nikos Mavrogiannopoulos + * + * This file is part of GnuTLS. + * + * GnuTLS is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * GnuTLS is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GnuTLS; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Parts copied from GnuTLS example programs. */ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#if !defined(_WIN32) +#include <netinet/in.h> +#include <sys/socket.h> +#include <sys/wait.h> +#include <arpa/inet.h> +#endif +#include <unistd.h> +#include <assert.h> +#include <gnutls/gnutls.h> +#include <gnutls/x509.h> + +#include "utils.h" +#include "cert-common.h" + +/* Test for gnutls_certificate_set_known_dh_params() + * + */ + +static void tls_log_func(int level, const char *str) +{ + fprintf(stderr, "<%d>| %s", level, str); +} + +static int +pskfunc(gnutls_session_t session, const char *username, + gnutls_datum_t * key) +{ + if (debug) + printf("psk callback to get %s's password\n", username); + key->data = gnutls_malloc(4); + key->data[0] = 0xDE; + key->data[1] = 0xAD; + key->data[2] = 0xBE; + key->data[3] = 0xEF; + key->size = 4; + return 0; +} + +void doit(void) +{ + gnutls_psk_client_credentials_t clicred; + gnutls_psk_server_credentials_t servcred; + const gnutls_datum_t key = { (void *) "DEADBEEF", 8 }; + + /* this must be called once in the program + */ + global_init(); + + gnutls_global_set_log_function(tls_log_func); + if (debug) + gnutls_global_set_log_level(6); + + assert(gnutls_psk_allocate_client_credentials(&clicred) >= 0); + assert(gnutls_psk_allocate_server_credentials(&servcred) >= 0); + + gnutls_psk_set_server_credentials_function(servcred, pskfunc); + + assert(gnutls_psk_set_client_credentials(clicred, "test", &key, + GNUTLS_PSK_KEY_HEX)>=0); + + assert(gnutls_psk_set_server_known_dh_params(servcred, GNUTLS_SEC_PARAM_LEGACY) >= 0); + assert(test_cli_serv_psk(servcred, clicred, "NORMAL:-KX-ALL:+DHE-PSK") >= 0); + + assert(gnutls_psk_set_server_known_dh_params(servcred, GNUTLS_SEC_PARAM_NORMAL) >= 0); + assert(test_cli_serv_psk(servcred, clicred, "NORMAL:-KX-ALL:+DHE-PSK") >= 0); + + assert(gnutls_psk_set_server_known_dh_params(servcred, GNUTLS_SEC_PARAM_HIGH) >= 0); + assert(test_cli_serv_psk(servcred, clicred, "NORMAL:-KX-ALL:+DHE-PSK") >= 0); + + assert(gnutls_psk_set_server_known_dh_params(servcred, GNUTLS_SEC_PARAM_ULTRA) >= 0); + assert(test_cli_serv_psk(servcred, clicred, "NORMAL:-KX-ALL:+DHE-PSK") >= 0); + + gnutls_psk_free_server_credentials(servcred); + gnutls_psk_free_client_credentials(clicred); + + gnutls_global_deinit(); + + if (debug) + success("success"); +} diff --git a/tests/utils-adv.c b/tests/utils-adv.c index 1c9f43cf42..6507a9314d 100644 --- a/tests/utils-adv.c +++ b/tests/utils-adv.c @@ -249,6 +249,66 @@ test_cli_serv_anon(gnutls_anon_server_credentials_t server_cred, return ret; } +int +test_cli_serv_psk(gnutls_psk_server_credentials_t server_cred, + gnutls_psk_client_credentials_t client_cred, + const char *prio) +{ + int exit_code = EXIT_SUCCESS; + int ret; + /* Server stuff. */ + gnutls_session_t server; + int sret = GNUTLS_E_AGAIN; + /* Client stuff. */ + gnutls_session_t client; + int cret = GNUTLS_E_AGAIN; + + /* General init. */ + reset_buffers(); + + /* Init server */ + gnutls_init(&server, GNUTLS_SERVER); + 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); + gnutls_transport_set_ptr(server, server); + + ret = gnutls_init(&client, GNUTLS_CLIENT); + if (ret < 0) + exit(1); + + ret = gnutls_credentials_set(client, GNUTLS_CRD_PSK, + client_cred); + if (ret < 0) + exit(1); + + gnutls_priority_set_direct(client, prio, NULL); + gnutls_transport_set_push_function(client, client_push); + gnutls_transport_set_pull_function(client, client_pull); + gnutls_transport_set_ptr(client, client); + + HANDSHAKE(client, server); + + ret = 0; + + gnutls_bye(client, GNUTLS_SHUT_RDWR); + gnutls_bye(server, GNUTLS_SHUT_RDWR); + + gnutls_deinit(client); + gnutls_deinit(server); + + if (debug > 0) { + if (exit_code == 0) + puts("Self-test successful"); + else + puts("Self-test failed"); + } + + return ret; +} + void test_cli_serv_cert(gnutls_certificate_credentials_t server_cred, gnutls_certificate_credentials_t client_cred, diff --git a/tests/utils.h b/tests/utils.h index 575952f6cb..f5d11476b4 100644 --- a/tests/utils.h +++ b/tests/utils.h @@ -82,6 +82,11 @@ test_cli_serv_anon(gnutls_anon_server_credentials_t server_cred, gnutls_anon_client_credentials_t client_cred, const char *prio); +int +test_cli_serv_psk(gnutls_psk_server_credentials_t server_cred, + gnutls_psk_client_credentials_t client_cred, + const char *prio); + typedef void callback_func(gnutls_session_t, void *priv); void test_cli_serv(gnutls_certificate_credentials_t server_cred, gnutls_certificate_credentials_t client_cred, |