diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-02-24 21:13:27 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-03-02 21:15:26 +0100 |
commit | 6868c57f0879e32f1a2d9da994bdf165609afc25 (patch) | |
tree | cf4b88f46cd4f40458cee77e92eb5d6ad67d5cd5 | |
parent | 04e19415815cbd867894117c9ae3e2c0ee97d01d (diff) | |
download | gnutls-6868c57f0879e32f1a2d9da994bdf165609afc25.tar.gz |
mini-dtls-pthread: renamed and fixed several shortcomings
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r-- | tests/Makefile.am | 4 | ||||
-rw-r--r-- | tests/dtls-pthread.c (renamed from tests/mini-dtls-pthread.c) | 214 |
2 files changed, 97 insertions, 121 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d05a4e67c5..bc01e25fb5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -163,7 +163,7 @@ ctests += mini-record-2 simple gnutls_hmac_fast set_pkcs12_cred cert certuniquei mini-chain-unsorted x509-verify-with-crl mini-dtls-mtu privkey-verify-broken \ mini-dtls-record-asym key-import-export priority-set priority-set2 \ pubkey-import-export sign-is-secure spki spki-abstract rsa-rsa-pss \ - mini-dtls-fork mini-dtls-pthread mini-key-material x509cert-invalid \ + mini-dtls-fork dtls-pthread mini-key-material x509cert-invalid \ tls-ext-register tls-supplemental mini-dtls0-9 duplicate-extensions \ record-retvals mini-server-name tls-etm tls-force-etm x509-cert-callback alerts \ client-sign-md5-rep tls12-invalid-key-exchanges session-rdn-read \ @@ -247,7 +247,7 @@ endif tls_pthread_LDADD = $(LDADD) -lpthread fips_mode_pthread_LDADD = $(LDADD) -lpthread -mini_dtls_pthread_LDADD = $(LDADD) -lpthread +dtls_pthread_LDADD = $(LDADD) -lpthread rng_pthread_LDADD = $(LDADD) -lpthread memset0_CFLAGS = -DCHAR=0x0 diff --git a/tests/mini-dtls-pthread.c b/tests/dtls-pthread.c index 77012553bc..31c2ce5ee4 100644 --- a/tests/mini-dtls-pthread.c +++ b/tests/dtls-pthread.c @@ -40,7 +40,9 @@ # include <sys/wait.h> # include <pthread.h> #endif +#include <assert.h> #include "utils.h" +#include "cert-common.h" #ifdef _WIN32 @@ -54,15 +56,6 @@ void doit(void) /* These are global */ pid_t child; -static void terminate(void) -{ - int status; - - kill(child, SIGTERM); - wait(&status); - exit(1); -} - /* Tests whether we can send and receive from different threads * using DTLS, either as server or client. DTLS is a superset of * TLS, so correct behavior under fork means TLS would operate too. @@ -75,76 +68,52 @@ static void tls_log_func(int level, const char *str) fprintf(stderr, "%s|<%d>| %s", side, level, str); } -static unsigned char server_cert_pem[] = - "-----BEGIN CERTIFICATE-----\n" - "MIICHzCCAaWgAwIBAgIBCTAKBggqhkjOPQQDAjA+MQswCQYDVQQGEwJOTDERMA8G\n" - "A1UEChMIUG9sYXJTU0wxHDAaBgNVBAMTE1BvbGFyc3NsIFRlc3QgRUMgQ0EwHhcN\n" - "MTMwOTI0MTU1MjA0WhcNMjMwOTIyMTU1MjA0WjA0MQswCQYDVQQGEwJOTDERMA8G\n" - "A1UEChMIUG9sYXJTU0wxEjAQBgNVBAMTCWxvY2FsaG9zdDBZMBMGByqGSM49AgEG\n" - "CCqGSM49AwEHA0IABDfMVtl2CR5acj7HWS3/IG7ufPkGkXTQrRS192giWWKSTuUA\n" - "2CMR/+ov0jRdXRa9iojCa3cNVc2KKg76Aci07f+jgZ0wgZowCQYDVR0TBAIwADAd\n" - "BgNVHQ4EFgQUUGGlj9QH2deCAQzlZX+MY0anE74wbgYDVR0jBGcwZYAUnW0gJEkB\n" - "PyvLeLUZvH4kydv7NnyhQqRAMD4xCzAJBgNVBAYTAk5MMREwDwYDVQQKEwhQb2xh\n" - "clNTTDEcMBoGA1UEAxMTUG9sYXJzc2wgVGVzdCBFQyBDQYIJAMFD4n5iQ8zoMAoG\n" - "CCqGSM49BAMCA2gAMGUCMQCaLFzXptui5WQN8LlO3ddh1hMxx6tzgLvT03MTVK2S\n" - "C12r0Lz3ri/moSEpNZWqPjkCMCE2f53GXcYLqyfyJR078c/xNSUU5+Xxl7VZ414V\n" - "fGa5kHvHARBPc8YAIVIqDvHH1Q==\n" - "-----END CERTIFICATE-----\n"; - -const gnutls_datum_t server_cert = { server_cert_pem, - sizeof(server_cert_pem) -}; - -static unsigned char server_key_pem[] = - "-----BEGIN EC PRIVATE KEY-----\n" - "MHcCAQEEIPEqEyB2AnCoPL/9U/YDHvdqXYbIogTywwyp6/UfDw6noAoGCCqGSM49\n" - "AwEHoUQDQgAEN8xW2XYJHlpyPsdZLf8gbu58+QaRdNCtFLX3aCJZYpJO5QDYIxH/\n" - "6i/SNF1dFr2KiMJrdw1VzYoqDvoByLTt/w==\n" - "-----END EC PRIVATE KEY-----\n"; - -const gnutls_datum_t server_key = { server_key_pem, - sizeof(server_key_pem) -}; - #define MSG "hello1111" #define MSG2 "xxxxxxxxxxxx" -static void *start_thread(void *arg) +#define NO_MSGS 128 + +static void *recv_thread(void *arg) { gnutls_session_t session = arg; int ret; + unsigned i; char buf[64]; if (debug) success("client: TLS version is: %s\n", gnutls_protocol_get_name (gnutls_protocol_get_version(session))); - sec_sleep(1); - /* the server should reflect our messages */ - ret = gnutls_record_recv(session, buf, sizeof(buf)); - if (ret != sizeof(MSG)-1 || memcmp(buf, MSG, sizeof(MSG)-1) != 0) { - fail("client: recv failed: %s\n", gnutls_strerror(ret)); - exit(1); - } - if (debug) { - fprintf(stderr, "client received: %.*s\n", ret, buf); + for (i=0;i<NO_MSGS;i++) { + /* the peer should reflect our messages */ + do { + ret = gnutls_record_recv(session, buf, sizeof(buf)); + } while(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); + if (ret < 0) + fail("client: recv failed: %s\n", gnutls_strerror(ret)); + if (ret != sizeof(MSG)-1 || memcmp(buf, MSG, sizeof(MSG)-1) != 0) { + fail("client: recv failed; not the expected values (got: %d, exp: %d)\n", ret, (int)sizeof(MSG)-1); + } + + if (debug) + success("%d: client received: %.*s\n", i, ret, buf); } - ret = gnutls_record_recv(session, buf, sizeof(buf)); - if (ret != sizeof(MSG2)-1 || memcmp(buf, MSG2, sizeof(MSG2)-1) != 0) { + /* final MSG is MSG2 */ + do { + ret = gnutls_record_recv(session, buf, sizeof(buf)); + } while(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); + if (ret < 0) fail("client: recv2 failed: %s\n", gnutls_strerror(ret)); - exit(1); - } - if (debug) { - fprintf(stderr, "client received: %.*s\n", ret, buf); + if (ret != sizeof(MSG2)-1 || memcmp(buf, MSG2, sizeof(MSG2)-1) != 0) { + fail("client: recv2 failed; not the expected values\n"); } - ret = gnutls_record_recv(session, buf, sizeof(buf)); - if (ret != 0) { - fail("client: recv3 failed: %s\n", gnutls_strerror(ret)); - exit(1); + if (debug) { + success("client received: %.*s\n", ret, buf); + success("closing recv thread\n"); } pthread_exit(0); @@ -154,27 +123,41 @@ static void do_thread_stuff(gnutls_session_t session) { int ret; + unsigned i; pthread_t id; + void *rval; + sec_sleep(1); /* separate sending from receiving */ - ret = pthread_create(&id, NULL, start_thread, session); + ret = pthread_create(&id, NULL, recv_thread, session); if (ret != 0) { - exit(1); + fail("error in pthread_create\n"); } - ret = gnutls_record_send(session, MSG, sizeof(MSG)-1); - if (ret != sizeof(MSG)-1) { - fail("client: send failed: %s\n", gnutls_strerror(ret)); - exit(1); + for (i=0;i<NO_MSGS;i++) { + do { + ret = gnutls_record_send(session, MSG, sizeof(MSG)-1); + } while(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); + if (ret != sizeof(MSG)-1) { + fail("client: send failed: %s\n", gnutls_strerror(ret)); + } } - ret = gnutls_record_send(session, MSG2, sizeof(MSG2)-1); + do { + ret = gnutls_record_send(session, MSG2, sizeof(MSG2)-1); + } while(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); if (ret != sizeof(MSG2)-1) { fail("client: send2 failed: %s\n", gnutls_strerror(ret)); - exit(1); } - sec_sleep(2); - gnutls_bye(session, GNUTLS_SHUT_WR); + + if (debug) + success("closing sending thread\n"); + assert(pthread_join(id, &rval)==0); + assert(rval == 0); + + do { + ret = gnutls_bye(session, GNUTLS_SHUT_RDWR); + } while(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); } static void do_reflect_stuff(gnutls_session_t session) @@ -184,38 +167,43 @@ static void do_reflect_stuff(gnutls_session_t session) int ret; do { - ret = gnutls_record_recv(session, buf, sizeof(buf)); + do { + ret = gnutls_record_recv(session, buf, sizeof(buf)); + } while(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); if (ret < 0) { fail("server: recv failed: %s\n", gnutls_strerror(ret)); - terminate(); } - if (ret == 0) + if (ret == 0) { break; + } buf_size = ret; if (debug) { - fprintf(stderr, "server received: %.*s\n", buf_size, buf); + success("server received: %.*s\n", buf_size, buf); } - ret = gnutls_record_send(session, buf, buf_size); + do { + ret = gnutls_record_send(session, buf, buf_size); + } while(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); if (ret < 0) { fail("server: send failed: %s\n", gnutls_strerror(ret)); - terminate(); } + if (debug) + success("reflected %d\n", ret); } while(1); - /* do not wait for the peer to close the connection. - */ - gnutls_bye(session, GNUTLS_SHUT_WR); + do { + gnutls_bye(session, GNUTLS_SHUT_WR); + } while(ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED); } -static void client(int fd, unsigned do_thread) +static void client(int fd, const char *prio, unsigned do_thread, unsigned false_start) { int ret; gnutls_certificate_credentials_t x509_cred; gnutls_session_t session; - /* Need to enable anonymous KX specifically. */ + unsigned flags = GNUTLS_CLIENT; global_init(); @@ -225,37 +213,28 @@ static void client(int fd, unsigned do_thread) gnutls_global_set_log_level(4711); } - gnutls_certificate_allocate_credentials(&x509_cred); + assert(gnutls_certificate_allocate_credentials(&x509_cred)>=0); - /* Initialize TLS session - */ - gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_DATAGRAM); + if (false_start) + flags |= GNUTLS_ENABLE_FALSE_START; + + assert(gnutls_init(&session, flags|GNUTLS_DATAGRAM) >= 0); gnutls_dtls_set_mtu(session, 1500); gnutls_dtls_set_timeouts(session, 6 * 1000, 60 * 1000); - //gnutls_transport_set_push_function(session, push); - /* Use default priorities */ - gnutls_priority_set_direct(session, - "NONE:+VERS-DTLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ECDHE-ECDSA:+CURVE-ALL", - NULL); + assert(gnutls_priority_set_direct(session, prio, NULL)>=0); - /* put the anonymous credentials to the current session - */ - gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); + assert(gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred)>=0); gnutls_transport_set_int(session, fd); - /* Perform the TLS handshake - */ do { ret = gnutls_handshake(session); } while (ret < 0 && gnutls_error_is_fatal(ret) == 0); if (ret < 0) { - fail("client: Handshake failed\n"); - gnutls_perror(ret); - exit(1); + fail("client: Handshake failed: %s\n", gnutls_strerror(ret)); } else { if (debug) success("client: Handshake was completed\n"); @@ -273,18 +252,14 @@ static void client(int fd, unsigned do_thread) gnutls_certificate_free_credentials(x509_cred); gnutls_global_deinit(); - exit(0); } - -static void server(int fd, unsigned do_thread) +static void server(int fd, const char *prio, unsigned do_thread) { int ret; gnutls_certificate_credentials_t x509_cred; gnutls_session_t session; - /* this must be called once in the program - */ global_init(); #if 0 @@ -295,21 +270,16 @@ static void server(int fd, unsigned do_thread) } #endif - gnutls_certificate_allocate_credentials(&x509_cred); - gnutls_certificate_set_x509_key_mem(x509_cred, &server_cert, + assert(gnutls_certificate_allocate_credentials(&x509_cred)>=0); + assert(gnutls_certificate_set_x509_key_mem(x509_cred, &server_cert, &server_key, - GNUTLS_X509_FMT_PEM); + GNUTLS_X509_FMT_PEM)>=0); - gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM); + assert(gnutls_init(&session, GNUTLS_SERVER | GNUTLS_DATAGRAM)>=0); gnutls_dtls_set_timeouts(session, 5 * 1000, 60 * 1000); gnutls_dtls_set_mtu(session, 400); - /* avoid calling all the priority functions, since the defaults - * are adequate. - */ - gnutls_priority_set_direct(session, - "NONE:+VERS-DTLS1.2:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ECDHE-ECDSA:+CURVE-ALL", - NULL); + assert(gnutls_priority_set_direct(session, prio, NULL)>=0); gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); @@ -323,7 +293,6 @@ static void server(int fd, unsigned do_thread) gnutls_deinit(session); fail("server: Handshake has failed (%s)\n\n", gnutls_strerror(ret)); - terminate(); } if (debug) success("server: Handshake was completed\n"); @@ -351,11 +320,14 @@ static void server(int fd, unsigned do_thread) } static -void run(unsigned do_thread) +void run(const char *str, const char *prio, unsigned do_thread, unsigned false_start) { int fd[2]; int ret; + if (str) + success("running %s\n", str); + ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fd); if (ret < 0) { perror("socketpair"); @@ -374,12 +346,12 @@ void run(unsigned do_thread) /* parent */ close(fd[1]); - client(fd[0], do_thread); + client(fd[0], prio, do_thread, false_start); wait(&status); check_wait_status(status); } else { close(fd[0]); - server(fd[1], 1-do_thread); + server(fd[1], prio, 1-do_thread); exit(0); } } @@ -387,7 +359,11 @@ void run(unsigned do_thread) void doit(void) { signal(SIGPIPE, SIG_IGN); - run(0); - run(1); + run("default, threaded client", "NORMAL", 0, 0); + run("default, threaded server", "NORMAL", 1, 0); + run("dtls1.2, threaded client", "NORMAL:-VERS-ALL:+VERS-DTLS1.2", 0, 0); + run("dtls1.2, threaded server", "NORMAL:-VERS-ALL:+VERS-DTLS1.2", 1, 0); + run("dtls1.2 false start, threaded client", "NORMAL:-VERS-ALL:+VERS-DTLS1.2", 0, 1); + run("dtls1.2 false start, threaded server", "NORMAL:-VERS-ALL:+VERS-DTLS1.2", 1, 1); } #endif /* _WIN32 */ |