X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=test%2Fasynciotest.c;h=ee450dafd31f677abd0af4233e23c175d113a5e2;hp=f80425eb928454f25cff9698bc9f287acbcb749e;hb=e2c1aa1ba3bc48eaaaed02c6a9a227d765e42fcb;hpb=d7295cd6d2e9f01b6aee367004e18c4c0a607565 diff --git a/test/asynciotest.c b/test/asynciotest.c index f80425eb92..ee450dafd3 100644 --- a/test/asynciotest.c +++ b/test/asynciotest.c @@ -15,9 +15,15 @@ #include "../ssl/packet_locl.h" +#include "ssltestlib.h" +#include "testutil.h" + /* Should we fragment records or not? 0 = no, !0 = yes*/ static int fragment = 0; +static char *cert = NULL; +static char *privkey = NULL; + static int async_new(BIO *bi); static int async_free(BIO *a); static int async_read(BIO *b, char *out, int outl); @@ -137,21 +143,33 @@ static int async_write(BIO *bio, const char *in, int inl) PACKET pkt; if (!PACKET_buf_init(&pkt, (const unsigned char *)in, inl)) - abort(); + return -1; while (PACKET_remaining(&pkt) > 0) { - PACKET payload; + PACKET payload, wholebody; unsigned int contenttype, versionhi, versionlo, data; + unsigned int msgtype = 0, negversion = 0; - if ( !PACKET_get_1(&pkt, &contenttype) - || !PACKET_get_1(&pkt, &versionhi) - || !PACKET_get_1(&pkt, &versionlo) - || !PACKET_get_length_prefixed_2(&pkt, &payload)) - abort(); + if (!PACKET_get_1(&pkt, &contenttype) + || !PACKET_get_1(&pkt, &versionhi) + || !PACKET_get_1(&pkt, &versionlo) + || !PACKET_get_length_prefixed_2(&pkt, &payload)) + return -1; /* Pretend we wrote out the record header */ written += SSL3_RT_HEADER_LENGTH; + wholebody = payload; + if (contenttype == SSL3_RT_HANDSHAKE + && !PACKET_get_1(&wholebody, &msgtype)) + return -1; + + if (msgtype == SSL3_MT_SERVER_HELLO + && (!PACKET_forward(&wholebody, + SSL3_HM_HEADER_LENGTH - 1) + || !PACKET_get_net_2(&wholebody, &negversion))) + return -1; + while (PACKET_get_1(&payload, &data)) { /* Create a new one byte long record for each byte in the * record in the input buffer @@ -171,14 +189,18 @@ static int async_write(BIO *bio, const char *in, int inl) smallrec[DATAPOS] = data; ret = BIO_write(next, smallrec, MIN_RECORD_LEN); if (ret <= 0) - abort(); + return -1; written++; } /* - * We can't fragment anything after the CCS, otherwise we - * get a bad record MAC + * We can't fragment anything after the ServerHello (or CCS <= + * TLS1.2), otherwise we get a bad record MAC + * TODO(TLS1.3): Change TLS1_3_VERSION_DRAFT to TLS1_3_VERSION + * before release */ - if (contenttype == SSL3_RT_CHANGE_CIPHER_SPEC) { + if (contenttype == SSL3_RT_CHANGE_CIPHER_SPEC + || (negversion == TLS1_3_VERSION_DRAFT + && msgtype == SSL3_MT_SERVER_HELLO)) { fragment = 0; break; } @@ -187,7 +209,7 @@ static int async_write(BIO *bio, const char *in, int inl) /* Write any data we have left after fragmenting */ ret = 0; if ((int)written < inl) { - ret = BIO_write(next, in + written , inl - written); + ret = BIO_write(next, in + written, inl - written); } if (ret <= 0 && BIO_should_write(next)) @@ -232,149 +254,130 @@ static int async_puts(BIO *bio, const char *str) return async_write(bio, str, strlen(str)); } -#define MAXLOOPS 100000 +#define MAX_ATTEMPTS 100 -int main(int argc, char *argv[]) +static int test_asyncio(int test) { SSL_CTX *serverctx = NULL, *clientctx = NULL; SSL *serverssl = NULL, *clientssl = NULL; - BIO *s_to_c_bio = NULL, *c_to_s_bio = NULL; BIO *s_to_c_fbio = NULL, *c_to_s_fbio = NULL; - int retc = -1, rets = -1, err, abortctr; - int test; + int testresult = 0, ret; + size_t i, j; + const char testdata[] = "Test data"; + char buf[sizeof(testdata)]; - CRYPTO_set_mem_debug(1); - CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - - if (argc != 3) { - printf("Invalid argument count\n"); + if (!TEST_true(create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(), + &serverctx, &clientctx, cert, privkey))) goto end; - } - serverctx = SSL_CTX_new(TLS_server_method()); - clientctx = SSL_CTX_new(TLS_client_method()); - if (serverctx == NULL || clientctx == NULL) { - printf("Failed to create SSL_CTX\n"); - goto end; - } + /* + * We do 2 test runs. The first time around we just do a normal handshake + * with lots of async io going on. The second time around we also break up + * all records so that the content is only one byte length (up until the + * CCS) + */ + if (test == 1) + fragment = 1; - if (SSL_CTX_use_certificate_file(serverctx, argv[1], - SSL_FILETYPE_PEM) <= 0) { - printf("Failed to load server certificate\n"); + + s_to_c_fbio = BIO_new(bio_f_async_filter()); + c_to_s_fbio = BIO_new(bio_f_async_filter()); + if (!TEST_ptr(s_to_c_fbio) + || !TEST_ptr(c_to_s_fbio)) { + BIO_free(s_to_c_fbio); + BIO_free(c_to_s_fbio); goto end; } - if (SSL_CTX_use_PrivateKey_file(serverctx, argv[2], - 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"); + + /* BIOs get freed on error */ + if (!TEST_true(create_ssl_objects(serverctx, clientctx, &serverssl, + &clientssl, s_to_c_fbio, c_to_s_fbio)) + || !TEST_true(create_ssl_connection(serverssl, clientssl, + SSL_ERROR_NONE))) goto end; - } /* - * We do 2 test runs. The first time around we just do a normal handshake - * with lots of async io going on. The second time around we also break up - * all records so that the content is only one byte length (up until the - * CCS) + * Send and receive some test data. Do the whole thing twice to ensure + * we hit at least one async event in both reading and writing */ - for (test = 1; test < 3; test++) { - abortctr = 0; - retc = rets = -1; - if (test == 2) - fragment = 1; - - serverssl = SSL_new(serverctx); - clientssl = SSL_new(clientctx); - if (serverssl == NULL || clientssl == NULL) { - printf("Failed to create SSL object\n"); - goto end; + for (j = 0; j < 2; j++) { + int len; + + /* + * Write some test data. It should never take more than 2 attempts + * (the first one might be a retryable fail). + */ + for (ret = -1, i = 0, len = 0; len != sizeof(testdata) && i < 2; + i++) { + ret = SSL_write(clientssl, testdata + len, + sizeof(testdata) - len); + if (ret > 0) { + len += ret; + } else { + int ssl_error = SSL_get_error(clientssl, ret); + + if (!TEST_false(ssl_error == SSL_ERROR_SYSCALL || + ssl_error == SSL_ERROR_SSL)) + goto end; + } } - - 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"); + if (!TEST_size_t_eq(len, sizeof(testdata))) goto end; - } - s_to_c_fbio = BIO_new(bio_f_async_filter()); - c_to_s_fbio = BIO_new(bio_f_async_filter()); - if (s_to_c_fbio == NULL || c_to_s_fbio == NULL) { - printf("Failed to create filter BIOs\n"); - goto end; + /* + * Now read the test data. It may take more attemps here because + * it could fail once for each byte read, including all overhead + * bytes from the record header/padding etc. + */ + for (ret = -1, i = 0, len = 0; len != sizeof(testdata) && + i < MAX_ATTEMPTS; i++) { + ret = SSL_read(serverssl, buf + len, sizeof(buf) - len); + if (ret > 0) { + len += ret; + } else { + int ssl_error = SSL_get_error(serverssl, ret); + + if (!TEST_false(ssl_error == SSL_ERROR_SYSCALL || + ssl_error == SSL_ERROR_SSL)) + goto end; + } } - - s_to_c_bio = BIO_push(s_to_c_fbio, s_to_c_bio); - 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 (!TEST_mem_eq(testdata, sizeof(testdata), buf, len)) goto end; - } + } - /* 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); + /* Also frees the BIOs */ + SSL_free(clientssl); + SSL_free(serverssl); + clientssl = serverssl = NULL; - /* Up ref these as we are passing them to two SSL objects */ - BIO_up_ref(s_to_c_bio); - BIO_up_ref(c_to_s_bio); + testresult = 1; - SSL_set_bio(serverssl, c_to_s_bio, s_to_c_bio); - SSL_set_bio(clientssl, s_to_c_bio, c_to_s_bio); + end: + SSL_free(clientssl); + SSL_free(serverssl); + SSL_CTX_free(clientctx); + SSL_CTX_free(serverctx); - do { - err = SSL_ERROR_WANT_WRITE; - while (retc <= 0 && err == SSL_ERROR_WANT_WRITE) { - retc = SSL_connect(clientssl); - if (retc <= 0) - err = SSL_get_error(clientssl, retc); - } + return testresult; +} - if (retc <= 0 && err != SSL_ERROR_WANT_READ) { - printf("Test %d failed: SSL_connect() failed %d, %d\n", - test, retc, err); - goto end; - } +int test_main(int argc, char *argv[]) +{ + int testresult = 0; - err = SSL_ERROR_WANT_WRITE; - while (rets <= 0 && err == SSL_ERROR_WANT_WRITE) { - rets = SSL_accept(serverssl); - if (rets <= 0) - err = SSL_get_error(serverssl, rets); - } + if (!TEST_int_eq(argc, 3)) + goto end; - if (rets <= 0 && err != SSL_ERROR_WANT_READ) { - printf("Test %d failed: SSL_accept() failed %d, %d\n", - test, retc, err); - goto end; - } - if (++abortctr == MAXLOOPS) { - printf("Test %d failed: No progress made\n", test); - goto end; - } - } while (retc <=0 || rets <= 0); + cert = argv[1]; + privkey = argv[2]; - /* Also frees the BIOs */ - SSL_free(clientssl); - SSL_free(serverssl); - clientssl = serverssl = NULL; - } + ADD_ALL_TESTS(test_asyncio, 2); - printf("Test success\n"); + testresult = run_tests(argv[0]); end: - if (retc <= 0 || rets <= 0) - ERR_print_errors_fp(stderr); - - SSL_free(clientssl); - SSL_free(serverssl); - SSL_CTX_free(clientctx); - SSL_CTX_free(serverctx); - -# ifndef OPENSSL_NO_CRYPTO_MDEBUG - CRYPTO_mem_leaks_fp(stderr); -# endif + BIO_meth_free(methods_async); - return (retc > 0 && rets > 0) ? 0 : 1; + return testresult; }