diff options
Diffstat (limited to 'tests/pskself.c')
| -rw-r--r-- | tests/pskself.c | 51 |
1 files changed, 7 insertions, 44 deletions
diff --git a/tests/pskself.c b/tests/pskself.c index 107b4e4324..3fb3c5875a 100644 --- a/tests/pskself.c +++ b/tests/pskself.c @@ -37,6 +37,8 @@ #include <unistd.h> #include <gnutls/gnutls.h> +#include "tcp.c" + #include "utils.h" /* A very basic TLS client, with PSK authentication. @@ -45,46 +47,7 @@ #define MAX_BUF 1024 #define MSG "Hello TLS" -/* Connects to the peer and returns a socket - * descriptor. - */ -int -tcp_connect (void) -{ - const char *PORT = "5556"; - const char *SERVER = "127.0.0.1"; - int err, sd; - struct sockaddr_in sa; - - /* connects to server - */ - sd = socket (AF_INET, SOCK_STREAM, 0); - - memset (&sa, '\0', sizeof (sa)); - sa.sin_family = AF_INET; - sa.sin_port = htons (atoi (PORT)); - inet_pton (AF_INET, SERVER, &sa.sin_addr); - - err = connect (sd, (struct sockaddr *) &sa, sizeof (sa)); - if (err < 0) - { - fprintf (stderr, "Connect error\n"); - exit (1); - } - - return sd; -} - -/* closes the given socket descriptor. - */ -void -tcp_close (int sd) -{ - shutdown (sd, SHUT_RDWR); /* no more receptions */ - close (sd); -} - -void +static void client (void) { int ret, sd, ii; @@ -93,7 +56,7 @@ client (void) gnutls_psk_client_credentials_t pskcred; /* Need to enable anonymous KX specifically. */ const int kx_prio[] = { GNUTLS_KX_PSK, 0 }; - const gnutls_datum_t key = { "DEADBEEF", 8 }; + const gnutls_datum_t key = { (char*) "DEADBEEF", 8 }; gnutls_global_init (); @@ -181,7 +144,7 @@ end: /* These are global */ gnutls_psk_server_credentials_t server_pskcred; -gnutls_session_t +static gnutls_session_t initialize_tls_session (void) { gnutls_session_t session; @@ -223,7 +186,7 @@ gnutls_session_t session; char buffer[MAX_BUF + 1]; int optval = 1; -void +static void server_start (void) { success ("Launched...\n"); @@ -264,7 +227,7 @@ server_start (void) success ("server: ready. Listening to port '%d'.\n", PORT); } -void +static void server (void) { /* this must be called once in the program |