From 8ed9a26616a7101ea698c189fbbb663186676075 Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Wed, 26 Apr 2017 12:20:44 -0400 Subject: [PATCH] Convert dtls_mtu_test, dtlsv1listentest Also converted most of ssltestlib but left the packet_dump output as-is (for now). Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/3257) --- test/build.info | 4 +- test/dtls_mtu_test.c | 133 +++++++++++++++-------------- test/dtlsv1listentest.c | 180 ++++++++++++---------------------------- test/libtestutil.a | Bin 0 -> 82398 bytes test/ssltestlib.c | 154 +++++++++++++--------------------- 5 files changed, 182 insertions(+), 289 deletions(-) create mode 100644 test/libtestutil.a diff --git a/test/build.info b/test/build.info index 9f4a434f9b..c8d86f7d13 100644 --- a/test/build.info +++ b/test/build.info @@ -233,7 +233,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN SOURCE[dtlsv1listentest]=dtlsv1listentest.c INCLUDE[dtlsv1listentest]=.. ../include - DEPEND[dtlsv1listentest]=../libssl + DEPEND[dtlsv1listentest]=../libssl libtestutil.a SOURCE[ct_test]=ct_test.c INCLUDE[ct_test]=../crypto/include ../include @@ -316,7 +316,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN PROGRAMS_NO_INST=dtls_mtu_test SOURCE[dtls_mtu_test]=dtls_mtu_test.c ssltestlib.c INCLUDE[dtls_mtu_test]=.. ../include - DEPEND[dtls_mtu_test]=../libcrypto ../libssl + DEPEND[dtls_mtu_test]=../libcrypto ../libssl libtestutil.a ENDIF IF[{- !$disabled{shared} -}] diff --git a/test/dtls_mtu_test.c b/test/dtls_mtu_test.c index 24d4ccc552..50f952b2ce 100644 --- a/test/dtls_mtu_test.c +++ b/test/dtls_mtu_test.c @@ -15,6 +15,7 @@ #include #include "ssltestlib.h" +#include "testutil.h" /* for SSL_READ_ETM() */ #include "../ssl/ssl_locl.h" @@ -57,21 +58,19 @@ static int mtu_test(SSL_CTX *ctx, const char *cs, int no_etm) memset(buf, 0x5a, sizeof(buf)); - if (create_ssl_objects(ctx, ctx, &srvr_ssl, &clnt_ssl, NULL, NULL) != 1) - goto out; + if (!TEST_true(create_ssl_objects(ctx, ctx, &srvr_ssl, &clnt_ssl, + NULL, NULL))) + goto end; if (no_etm) SSL_set_options(srvr_ssl, SSL_OP_NO_ENCRYPT_THEN_MAC); - if (SSL_set_cipher_list(srvr_ssl, cs) != 1 || - SSL_set_cipher_list(clnt_ssl, cs) != 1) { - ERR_print_errors_fp(stdout); - goto out; - } - sc_bio = SSL_get_rbio(srvr_ssl); - - if (create_ssl_connection(clnt_ssl, srvr_ssl, SSL_ERROR_NONE) != 1) - goto out; + if (!TEST_true(SSL_set_cipher_list(srvr_ssl, cs)) + || !TEST_true(SSL_set_cipher_list(clnt_ssl, cs)) + || !TEST_ptr(sc_bio = SSL_get_rbio(srvr_ssl)) + || !TEST_true(create_ssl_connection(clnt_ssl, srvr_ssl, + SSL_ERROR_NONE))) + goto end; if (debug) printf("Channel established\n"); @@ -82,28 +81,27 @@ static int mtu_test(SSL_CTX *ctx, const char *cs, int no_etm) SSL_set_mtu(clnt_ssl, 500 + i); mtus[i] = DTLS_get_data_mtu(clnt_ssl); if (debug) - printf("%s%s payload MTU for record mtu %d = %"OSSLzu"\n", - cs, no_etm ? "-noEtM":"", 500 + i, mtus[i]); - if (mtus[i] == 0) { - fprintf(stderr, - "payload MTU failed with record MTU %d for %s\n", - 500 + i, cs); - goto out; + TEST_info("%s%s MTU for record mtu %d = %lu", + cs, no_etm ? "-noEtM" : "", + 500 + i, (unsigned long)mtus[i]); + if (!TEST_size_t_ne(mtus[i], 0)) { + TEST_info("Cipher %s MTU %d", cs, 500 + i); + goto end; } } /* Now get out of the way */ SSL_set_mtu(clnt_ssl, 1000); - /* Now for all values in the range of payload MTUs, send - * a payload of that size and see what actual record size - * we end up with. */ + /* + * Now for all values in the range of payload MTUs, send a payload of + * that size and see what actual record size we end up with. + */ for (s = mtus[0]; s <= mtus[29]; s++) { size_t reclen; - if (SSL_write(clnt_ssl, buf, s) != (int)s) { - ERR_print_errors_fp(stdout); - goto out; - } + + if (!TEST_int_eq(SSL_write(clnt_ssl, buf, s), (int)s)) + goto end; reclen = BIO_read(sc_bio, buf, sizeof(buf)); if (debug) printf("record %"OSSLzu" for payload %"OSSLzu"\n", reclen, s); @@ -111,53 +109,58 @@ static int mtu_test(SSL_CTX *ctx, const char *cs, int no_etm) for (i = 0; i < 30; i++) { /* DTLS_get_data_mtu() with record MTU 500+i returned mtus[i] ... */ - if (s <= mtus[i] && reclen > (size_t)(500 + i)) { - /* We sent a packet smaller than or equal to mtus[j] and - * that made a record *larger* than the record MTU 500+j! */ - fprintf(stderr, - "%s: Payload MTU %"OSSLzu" reported for record MTU %d\n" - "but sending a payload of %"OSSLzu" made a record of %"OSSLzu"(too large)\n", - cs, mtus[i], 500 + i, s, reclen); - goto out; + if (!TEST_false(s <= mtus[i] && reclen > (size_t)(500 + i))) { + /* + * We sent a packet smaller than or equal to mtus[j] and + * that made a record *larger* than the record MTU 500+j! + */ + TEST_error("%s: s=%lu, mtus[i]=%lu, reclen=%lu, i=%d", + cs, (unsigned long)s, (unsigned long)mtus[i], + (unsigned long)reclen, 500 + i); + goto end; } - if (s > mtus[i] && reclen <= (size_t)(500 + i)) { - /* We sent a *larger* packet than mtus[i] and that *still* + if (!TEST_false(s > mtus[i] && reclen <= (size_t)(500 + i))) { + /* + * We sent a *larger* packet than mtus[i] and that *still* * fits within the record MTU 500+i, so DTLS_get_data_mtu() - * was overly pessimistic. */ - fprintf(stderr, - "%s: Payload MTU %"OSSLzu" reported for record MTU %d\n" - "but sending a payload of %"OSSLzu" made a record of %"OSSLzu" (too small)\n", - cs, mtus[i], 500 + i, s, reclen); - goto out; + * was overly pessimistic. + */ + TEST_error("%s: s=%lu, mtus[i]=%lu, reclen=%lu, i=%d", + cs, (unsigned long)s, (unsigned long)mtus[i], + (unsigned long)reclen, 500 + i); + goto end; } } } rv = 1; if (SSL_READ_ETM(clnt_ssl)) rv = 2; - out: + end: SSL_free(clnt_ssl); SSL_free(srvr_ssl); return rv; } -int main(void) +static int run_mtu_tests(void) { - SSL_CTX *ctx = SSL_CTX_new(DTLS_method()); + SSL_CTX *ctx = NULL; STACK_OF(SSL_CIPHER) *ciphers; - int i, rv = 0; + int i, ret = 0; + + if (!TEST_ptr(ctx = SSL_CTX_new(DTLS_method()))) + goto end; SSL_CTX_set_psk_server_callback(ctx, srvr_psk_callback); SSL_CTX_set_psk_client_callback(ctx, clnt_psk_callback); SSL_CTX_set_security_level(ctx, 0); - /* We only care about iterating over each enc/mac; we don't - * want to repeat the test for each auth/kx variant. - * So keep life simple and only do (non-DH) PSK. */ - if (!SSL_CTX_set_cipher_list(ctx, "PSK")) { - fprintf(stderr, "Failed to set PSK cipher list\n"); - goto out; - } + /* + * We only care about iterating over each enc/mac; we don't want to + * repeat the test for each auth/kx variant. So keep life simple and + * only do (non-DH) PSK. + */ + if (!TEST_true(SSL_CTX_set_cipher_list(ctx, "PSK"))) + goto end; ciphers = SSL_CTX_get_ciphers(ctx); for (i = 0; i < sk_SSL_CIPHER_num(ciphers); i++) { @@ -165,26 +168,28 @@ int main(void) const char *cipher_name = SSL_CIPHER_get_name(cipher); /* As noted above, only one test for each enc/mac variant. */ - if (strncmp(cipher_name, "PSK-", 4)) + if (strncmp(cipher_name, "PSK-", 4) != 0) continue; - rv = mtu_test(ctx, cipher_name, 0); - if (!rv) + if (!TEST_int_gt(ret = mtu_test(ctx, cipher_name, 0), 0)) break; - - printf("DTLS MTU test OK for %s\n", cipher_name); - if (rv == 1) + TEST_info("%s OK", cipher_name); + if (ret == 1) continue; /* mtu_test() returns 2 if it used Encrypt-then-MAC */ - rv = mtu_test(ctx, cipher_name, 1); - if (!rv) + if (!TEST_int_gt(ret = mtu_test(ctx, cipher_name, 1), 0)) break; - - printf("DTLS MTU test OK for %s without Encrypt-then-MAC\n", cipher_name); + TEST_info("%s without EtM OK", cipher_name); } - out: + + end: SSL_CTX_free(ctx); + bio_s_mempacket_test_free(); + return ret; +} - return !rv; +void register_tests() +{ + ADD_TEST(run_mtu_tests); } diff --git a/test/dtlsv1listentest.c b/test/dtlsv1listentest.c index dfbc7aebb8..b70c60e618 100644 --- a/test/dtlsv1listentest.c +++ b/test/dtlsv1listentest.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -12,10 +12,8 @@ #include #include #include -#ifndef OPENSSL_NO_ENGINE -# include -#endif #include "e_os.h" +#include "testutil.h" #ifndef OPENSSL_NO_SOCK @@ -236,7 +234,7 @@ static const unsigned char verify[] = { 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13 /* Cookie */ }; -static struct { +typedef struct { const unsigned char *in; unsigned int inlen; /* @@ -245,52 +243,18 @@ static struct { * DROP == 0 return value, no output */ enum {GOOD, VERIFY, DROP} outtype; -} testpackets[9] = { - { - clienthello_nocookie, - sizeof(clienthello_nocookie), - VERIFY - }, - { - clienthello_nocookie_frag, - sizeof(clienthello_nocookie_frag), - VERIFY - }, - { - clienthello_nocookie_short, - sizeof(clienthello_nocookie_short), - DROP - }, - { - clienthello_2ndfrag, - sizeof(clienthello_2ndfrag), - DROP - }, - { - clienthello_cookie, - sizeof(clienthello_cookie), - GOOD - }, - { - clienthello_cookie_frag, - sizeof(clienthello_cookie_frag), - GOOD - }, - { - clienthello_badcookie, - sizeof(clienthello_badcookie), - VERIFY - }, - { - clienthello_cookie_short, - sizeof(clienthello_cookie_short), - DROP - }, - { - record_short, - sizeof(record_short), - DROP - } +} tests; + +static tests testpackets[9] = { + { clienthello_nocookie, sizeof(clienthello_nocookie), VERIFY }, + { clienthello_nocookie_frag, sizeof(clienthello_nocookie_frag), VERIFY }, + { clienthello_nocookie_short, sizeof(clienthello_nocookie_short), DROP }, + { clienthello_2ndfrag, sizeof(clienthello_2ndfrag), DROP }, + { clienthello_cookie, sizeof(clienthello_cookie), GOOD }, + { clienthello_cookie_frag, sizeof(clienthello_cookie_frag), GOOD }, + { clienthello_badcookie, sizeof(clienthello_badcookie), VERIFY }, + { clienthello_cookie_short, sizeof(clienthello_cookie_short), DROP }, + { record_short, sizeof(record_short), DROP } }; # define COOKIE_LEN 20 @@ -299,9 +263,8 @@ static int cookie_gen(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len) { unsigned int i; - for (i = 0; i < COOKIE_LEN; i++, cookie++) { + for (i = 0; i < COOKIE_LEN; i++, cookie++) *cookie = i; - } *cookie_len = COOKIE_LEN; return 1; @@ -322,105 +285,72 @@ static int cookie_verify(SSL *ssl, const unsigned char *cookie, return 1; } -#endif -int main(void) +static int dtls_listen_test(int i) { -#ifndef OPENSSL_NO_SOCK SSL_CTX *ctx = NULL; SSL *ssl = NULL; BIO *outbio = NULL; BIO *inbio = NULL; - BIO_ADDR *peer = BIO_ADDR_new(); + BIO_ADDR *peer = NULL; + tests *tp = &testpackets[i]; char *data; long datalen; int ret, success = 0; - long i; - ctx = SSL_CTX_new(DTLS_server_method()); - if (ctx == NULL || peer == NULL) + if (!TEST_ptr(ctx = SSL_CTX_new(DTLS_server_method())) + || !TEST_ptr(peer = BIO_ADDR_new())) goto err; - SSL_CTX_set_cookie_generate_cb(ctx, cookie_gen); SSL_CTX_set_cookie_verify_cb(ctx, cookie_verify); - /* Create an SSL object for the connection */ - ssl = SSL_new(ctx); - if (ssl == NULL) - goto err; - - outbio = BIO_new(BIO_s_mem()); - if (outbio == NULL) + /* Create an SSL object and set the BIO */ + if (!TEST_ptr(ssl = SSL_new(ctx)) + || !TEST_ptr(outbio = BIO_new(BIO_s_mem()))) goto err; SSL_set0_wbio(ssl, outbio); - success = 1; - for (i = 0; i < (long)OSSL_NELEM(testpackets) && success; i++) { - inbio = BIO_new_mem_buf((char *)testpackets[i].in, - testpackets[i].inlen); - if (inbio == NULL) { - success = 0; - goto err; - } - /* Set Non-blocking IO behaviour */ - BIO_set_mem_eof_return(inbio, -1); + /* Set Non-blocking IO behaviour */ + if (!TEST_ptr(inbio = BIO_new_mem_buf((char *)tp->in, tp->inlen))) + goto err; + BIO_set_mem_eof_return(inbio, -1); + SSL_set0_rbio(ssl, inbio); - SSL_set0_rbio(ssl, inbio); + /* Process the incoming packet */ + if (!TEST_int_ge(ret = DTLSv1_listen(ssl, peer), 0)) + goto err; + datalen = BIO_get_mem_data(outbio, &data); - /* Process the incoming packet */ - ret = DTLSv1_listen(ssl, peer); - if (ret < 0) { - success = 0; + if (tp->outtype == VERIFY) { + if (!TEST_int_eq(ret, 0) + || !TEST_mem_eq(data, datalen, verify, sizeof(verify))) goto err; - } - - datalen = BIO_get_mem_data(outbio, &data); - - if (testpackets[i].outtype == VERIFY) { - if (ret == 0) { - if (datalen != sizeof(verify) - || (memcmp(data, verify, sizeof(verify)) != 0)) { - printf("Test %ld failure: incorrect HelloVerifyRequest\n", i); - success = 0; - } else { - printf("Test %ld success\n", i); - } - } else { - printf ("Test %ld failure: should not have succeeded\n", i); - success = 0; - } - } else if (datalen == 0) { - if ((ret == 0 && testpackets[i].outtype == DROP) - || (ret == 1 && testpackets[i].outtype == GOOD)) { - printf("Test %ld success\n", i); - } else { - printf("Test %ld failure: wrong return value\n", i); - success = 0; - } - } else { - printf("Test %ld failure: Unexpected data output\n", i); - success = 0; - } - (void)BIO_reset(outbio); - inbio = NULL; - /* Frees up inbio */ - SSL_set0_rbio(ssl, NULL); + } else if (datalen == 0) { + if (!TEST_true((ret == 0 && tp->outtype == DROP) + || (ret == 1 && tp->outtype == GOOD))) + goto err; + } else { + TEST_info("Test %d: unexpected data output", i); + goto err; } + (void)BIO_reset(outbio); + inbio = NULL; + SSL_set0_rbio(ssl, NULL); + success = 1; err: - if (!success) - ERR_print_errors_fp(stderr); /* Also frees up outbio */ SSL_free(ssl); SSL_CTX_free(ctx); BIO_free(inbio); OPENSSL_free(peer); -# ifndef OPENSSL_NO_CRYPTO_MDEBUG - CRYPTO_mem_leaks_fp(stderr); -# endif - return success ? 0 : 1; -#else - printf("DTLSv1_listen() is not supported by this build - skipping\n"); - return 0; + return success; +} +#endif + +void register_tests() +{ +#ifndef OPENSSL_NO_SOCK + ADD_ALL_TESTS(dtls_listen_test, (int)OSSL_NELEM(testpackets)); #endif } diff --git a/test/libtestutil.a b/test/libtestutil.a new file mode 100644 index 0000000000000000000000000000000000000000..973419527666f587263016dfc41358af65077158 GIT binary patch literal 82398 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 T6^`q-A1NHyIo%4!`ThR^t|vck literal 0 HcmV?d00001 diff --git a/test/ssltestlib.c b/test/ssltestlib.c index 6fce12e0fc..9bce0d32d1 100644 --- a/test/ssltestlib.c +++ b/test/ssltestlib.c @@ -11,6 +11,7 @@ #include "e_os.h" #include "ssltestlib.h" +#include "testutil.h" static int tls_dump_new(BIO *bi); static int tls_dump_free(BIO *a); @@ -21,12 +22,11 @@ static int tls_dump_gets(BIO *bp, char *buf, int size); static int tls_dump_puts(BIO *bp, const char *str); /* Choose a sufficiently large type likely to be unused for this custom BIO */ -# define BIO_TYPE_TLS_DUMP_FILTER (0x80 | BIO_TYPE_FILTER) - -# define BIO_TYPE_MEMPACKET_TEST 0x81 +#define BIO_TYPE_TLS_DUMP_FILTER (0x80 | BIO_TYPE_FILTER) +#define BIO_TYPE_MEMPACKET_TEST 0x81 static BIO_METHOD *method_tls_dump = NULL; -static BIO_METHOD *method_mempacket_test = NULL; +static BIO_METHOD *meth_mem = NULL; /* Note: Not thread safe! */ const BIO_METHOD *bio_f_tls_dump_filter(void) @@ -265,34 +265,33 @@ static int mempacket_test_puts(BIO *bp, const char *str); const BIO_METHOD *bio_s_mempacket_test(void) { - if (method_mempacket_test == NULL) { - method_mempacket_test = BIO_meth_new(BIO_TYPE_MEMPACKET_TEST, - "Mem Packet Test"); - if ( method_mempacket_test == NULL - || !BIO_meth_set_write(method_mempacket_test, mempacket_test_write) - || !BIO_meth_set_read(method_mempacket_test, mempacket_test_read) - || !BIO_meth_set_puts(method_mempacket_test, mempacket_test_puts) - || !BIO_meth_set_gets(method_mempacket_test, mempacket_test_gets) - || !BIO_meth_set_ctrl(method_mempacket_test, mempacket_test_ctrl) - || !BIO_meth_set_create(method_mempacket_test, mempacket_test_new) - || !BIO_meth_set_destroy(method_mempacket_test, mempacket_test_free)) + if (meth_mem == NULL) { + if (!TEST_ptr(meth_mem = BIO_meth_new(BIO_TYPE_MEMPACKET_TEST, + "Mem Packet Test")) + || !TEST_true(BIO_meth_set_write(meth_mem, mempacket_test_write)) + || !TEST_true(BIO_meth_set_read(meth_mem, mempacket_test_read)) + || !TEST_true(BIO_meth_set_puts(meth_mem, mempacket_test_puts)) + || !TEST_true(BIO_meth_set_gets(meth_mem, mempacket_test_gets)) + || !TEST_true(BIO_meth_set_ctrl(meth_mem, mempacket_test_ctrl)) + || !TEST_true(BIO_meth_set_create(meth_mem, mempacket_test_new)) + || !TEST_true(BIO_meth_set_destroy(meth_mem, mempacket_test_free))) return NULL; } - return method_mempacket_test; + return meth_mem; } void bio_s_mempacket_test_free(void) { - BIO_meth_free(method_mempacket_test); + BIO_meth_free(meth_mem); } static int mempacket_test_new(BIO *bio) { - MEMPACKET_TEST_CTX *ctx = OPENSSL_zalloc(sizeof(*ctx)); - if (ctx == NULL) + MEMPACKET_TEST_CTX *ctx; + + if (!TEST_ptr(ctx = OPENSSL_zalloc(sizeof(*ctx)))) return 0; - ctx->pkts = sk_MEMPACKET_new_null(); - if (ctx->pkts == NULL) { + if (!TEST_ptr(ctx->pkts = sk_MEMPACKET_new_null())) { OPENSSL_free(ctx); return 0; } @@ -309,7 +308,6 @@ static int mempacket_test_free(BIO *bio) OPENSSL_free(ctx); BIO_set_data(bio, NULL); BIO_set_init(bio, 0); - return 1; } @@ -331,7 +329,6 @@ static int mempacket_test_read(BIO *bio, char *out, int outl) unsigned int seq, offset, len, epoch; BIO_clear_retry_flags(bio); - thispkt = sk_MEMPACKET_value(ctx->pkts, 0); if (thispkt == NULL || thispkt->num != ctx->currpkt) { /* Probably run out of data */ @@ -351,12 +348,10 @@ static int mempacket_test_read(BIO *bio, char *out, int outl) * we know that there won't be any re-ordering. We overwrite to deal * with any packets that have been injected */ - rem = thispkt->len; - rec = thispkt->data; - while (rem > 0) { - if (rem < DTLS1_RT_HEADER_LENGTH) { + for (rem = thispkt->len, rec = thispkt->data + ; rem > 0; rec += len, rem -= len) { + if (rem < DTLS1_RT_HEADER_LENGTH) return -1; - } epoch = (rec[EPOCH_HI] << 8) | rec[EPOCH_LO]; if (epoch != ctx->epoch) { ctx->epoch = epoch; @@ -373,16 +368,11 @@ static int mempacket_test_read(BIO *bio, char *out, int outl) len = ((rec[RECORD_LEN_HI] << 8) | rec[RECORD_LEN_LO]) + DTLS1_RT_HEADER_LENGTH; - - rec += len; - rem -= len; } } memcpy(out, thispkt->data, outl); - mempacket_free(thispkt); - return outl; } @@ -404,12 +394,9 @@ int mempacket_test_inject(BIO *bio, const char *in, int inl, int pktnum, ctx->noinject = 1; } - thispkt = OPENSSL_malloc(sizeof(MEMPACKET)); - if (thispkt == NULL) + if (!TEST_ptr(thispkt = OPENSSL_malloc(sizeof(*thispkt)))) return -1; - - thispkt->data = OPENSSL_malloc(inl); - if (thispkt->data == NULL) { + if (!TEST_ptr(thispkt->data = OPENSSL_malloc(inl))) { mempacket_free(thispkt); return -1; } @@ -530,26 +517,16 @@ int create_ssl_ctx_pair(const SSL_METHOD *sm, const SSL_METHOD *cm, SSL_CTX *serverctx = NULL; SSL_CTX *clientctx = NULL; - serverctx = SSL_CTX_new(sm); - clientctx = SSL_CTX_new(cm); - if (serverctx == NULL || clientctx == NULL) { - printf("Failed to create SSL_CTX\n"); + if (!TEST_ptr(serverctx = SSL_CTX_new(sm)) + || !TEST_ptr(clientctx = SSL_CTX_new(cm))) goto err; - } - if (SSL_CTX_use_certificate_file(serverctx, certfile, - SSL_FILETYPE_PEM) <= 0) { - printf("Failed to load server certificate\n"); + if (!TEST_int_eq(SSL_CTX_use_certificate_file(serverctx, certfile, + SSL_FILETYPE_PEM), 1) + || !TEST_int_eq(SSL_CTX_use_PrivateKey_file(serverctx, privkeyfile, + SSL_FILETYPE_PEM), 1) + || !TEST_int_eq(SSL_CTX_check_private_key(serverctx), 1)) goto err; - } - if (SSL_CTX_use_PrivateKey_file(serverctx, privkeyfile, - SSL_FILETYPE_PEM) <= 0) { - printf("Failed to load server private key\n"); - } - if (SSL_CTX_check_private_key(serverctx) <= 0) { - printf("Failed to check private key\n"); - goto err; - } #ifndef OPENSSL_NO_DH SSL_CTX_set_dh_auto(serverctx, 1); @@ -557,8 +534,8 @@ int create_ssl_ctx_pair(const SSL_METHOD *sm, const SSL_METHOD *cm, *sctx = serverctx; *cctx = clientctx; - return 1; + err: SSL_CTX_free(serverctx); SSL_CTX_free(clientctx); @@ -573,62 +550,46 @@ int create_ssl_ctx_pair(const SSL_METHOD *sm, const SSL_METHOD *cm, int create_ssl_objects(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl, SSL **cssl, BIO *s_to_c_fbio, BIO *c_to_s_fbio) { - SSL *serverssl, *clientssl; + SSL *serverssl = NULL, *clientssl = NULL; BIO *s_to_c_bio = NULL, *c_to_s_bio = NULL; - if (*sssl == NULL) - serverssl = SSL_new(serverctx); - else + if (*sssl != NULL) serverssl = *sssl; - if (*cssl == NULL) - clientssl = SSL_new(clientctx); - else + else if (!TEST_ptr(serverssl = SSL_new(serverctx))) + goto error; + if (*cssl != NULL) clientssl = *cssl; - - if (serverssl == NULL || clientssl == NULL) { - printf("Failed to create SSL object\n"); + else if (!TEST_ptr(clientssl = SSL_new(clientctx))) goto error; - } if (SSL_is_dtls(clientssl)) { - s_to_c_bio = BIO_new(bio_s_mempacket_test()); - c_to_s_bio = BIO_new(bio_s_mempacket_test()); + if (!TEST_ptr(s_to_c_bio = BIO_new(bio_s_mempacket_test())) + || !TEST_ptr(c_to_s_bio = BIO_new(bio_s_mempacket_test()))) + goto error; } else { - s_to_c_bio = BIO_new(BIO_s_mem()); - c_to_s_bio = BIO_new(BIO_s_mem()); - } - if (s_to_c_bio == NULL || c_to_s_bio == NULL) { - printf("Failed to create mem BIOs\n"); - goto error; + if (!TEST_ptr(s_to_c_bio = BIO_new(BIO_s_mem())) + || !TEST_ptr(c_to_s_bio = BIO_new(BIO_s_mem()))) + goto error; } - if (s_to_c_fbio != NULL) - s_to_c_bio = BIO_push(s_to_c_fbio, s_to_c_bio); - if (c_to_s_fbio != NULL) - c_to_s_bio = BIO_push(c_to_s_fbio, c_to_s_bio); - if (s_to_c_bio == NULL || c_to_s_bio == NULL) { - printf("Failed to create chained BIOs\n"); + if (s_to_c_fbio != NULL + && !TEST_ptr(s_to_c_bio = BIO_push(s_to_c_fbio, s_to_c_bio))) + goto error; + if (c_to_s_fbio != NULL + && !TEST_ptr(c_to_s_bio = BIO_push(c_to_s_fbio, c_to_s_bio))) goto error; - } /* Set Non-blocking IO behaviour */ BIO_set_mem_eof_return(s_to_c_bio, -1); BIO_set_mem_eof_return(c_to_s_bio, -1); /* Up ref these as we are passing them to two SSL objects */ + SSL_set_bio(serverssl, c_to_s_bio, s_to_c_bio); BIO_up_ref(s_to_c_bio); BIO_up_ref(c_to_s_bio); - - SSL_set_bio(serverssl, c_to_s_bio, s_to_c_bio); SSL_set_bio(clientssl, s_to_c_bio, c_to_s_bio); - - /* BIOs will now be freed when SSL objects are freed */ - s_to_c_bio = c_to_s_bio = NULL; - s_to_c_fbio = c_to_s_fbio = NULL; - *sssl = serverssl; *cssl = clientssl; - return 1; error: @@ -658,7 +619,7 @@ int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want) } if (!clienterr && retc <= 0 && err != SSL_ERROR_WANT_READ) { - printf("SSL_connect() failed %d, %d\n", retc, err); + TEST_info("SSL_connect() failed %d, %d", retc, err); clienterr = 1; } if (want != SSL_ERROR_NONE && err == want) @@ -672,7 +633,7 @@ int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want) } if (!servererr && rets <= 0 && err != SSL_ERROR_WANT_READ) { - printf("SSL_accept() failed %d, %d\n", rets, err); + TEST_info("SSL_accept() failed %d, %d", rets, err); servererr = 1; } if (want != SSL_ERROR_NONE && err == want) @@ -680,7 +641,7 @@ int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want) if (clienterr && servererr) return 0; if (++abortctr == MAXLOOPS) { - printf("No progress made\n"); + TEST_info("No progress made"); return 0; } } while (retc <=0 || rets <= 0); @@ -691,12 +652,9 @@ int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want) * appropriate. */ if (SSL_read_ex(clientssl, &buf, sizeof(buf), &readbytes) > 0) { - if (readbytes != 0) { - printf("Unexpected success reading data %"OSSLzu"\n", readbytes); + if (!TEST_ulong_eq(readbytes, 0)) return 0; - } - } else if (SSL_get_error(clientssl, 0) != SSL_ERROR_WANT_READ) { - printf("SSL_read_ex() failed\n"); + } else if (!TEST_int_eq(SSL_get_error(clientssl, 0), SSL_ERROR_WANT_READ)) { return 0; } -- 2.25.1