diff options
Diffstat (limited to 'crypto/openssl/test/ssl_test.c')
| -rw-r--r-- | crypto/openssl/test/ssl_test.c | 199 |
1 files changed, 98 insertions, 101 deletions
diff --git a/crypto/openssl/test/ssl_test.c b/crypto/openssl/test/ssl_test.c index 841d2294abaa..27b44156b3a3 100644 --- a/crypto/openssl/test/ssl_test.c +++ b/crypto/openssl/test/ssl_test.c @@ -35,8 +35,8 @@ static int check_result(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) { if (!TEST_int_eq(result->result, test_ctx->expected_result)) { TEST_info("ExpectedResult mismatch: expected %s, got %s.", - ssl_test_result_name(test_ctx->expected_result), - ssl_test_result_name(result->result)); + ssl_test_result_name(test_ctx->expected_result), + ssl_test_result_name(result->result)); return 0; } return 1; @@ -45,10 +45,10 @@ static int check_result(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) static int check_alerts(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) { if (!TEST_int_eq(result->client_alert_sent, - result->client_alert_received)) { + result->client_alert_received)) { TEST_info("Client sent alert %s but server received %s.", - print_alert(result->client_alert_sent), - print_alert(result->client_alert_received)); + print_alert(result->client_alert_sent), + print_alert(result->client_alert_received)); /* * We can't bail here because the peer doesn't always get far enough * to process a received alert. Specifically, in protocol version @@ -64,10 +64,10 @@ static int check_alerts(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) } if (!TEST_int_eq(result->server_alert_sent, - result->server_alert_received)) { + result->server_alert_received)) { TEST_info("Server sent alert %s but client received %s.", - print_alert(result->server_alert_sent), - print_alert(result->server_alert_received)); + print_alert(result->server_alert_sent), + print_alert(result->server_alert_received)); /* return 0; */ } @@ -80,16 +80,16 @@ static int check_alerts(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) */ && (result->client_alert_sent & 0xff) != test_ctx->expected_client_alert) { TEST_error("ClientAlert mismatch: expected %s, got %s.", - print_alert(test_ctx->expected_client_alert), - print_alert(result->client_alert_sent)); + print_alert(test_ctx->expected_client_alert), + print_alert(result->client_alert_sent)); return 0; } if (test_ctx->expected_server_alert && (result->server_alert_sent & 0xff) != test_ctx->expected_server_alert) { TEST_error("ServerAlert mismatch: expected %s, got %s.", - print_alert(test_ctx->expected_server_alert), - print_alert(result->server_alert_sent)); + print_alert(test_ctx->expected_server_alert), + print_alert(result->server_alert_sent)); return 0; } @@ -104,17 +104,17 @@ static int check_protocol(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) { if (!TEST_int_eq(result->client_protocol, result->server_protocol)) { TEST_info("Client has protocol %s but server has %s.", - ssl_protocol_name(result->client_protocol), - ssl_protocol_name(result->server_protocol)); + ssl_protocol_name(result->client_protocol), + ssl_protocol_name(result->server_protocol)); return 0; } if (test_ctx->expected_protocol) { if (!TEST_int_eq(result->client_protocol, - test_ctx->expected_protocol)) { + test_ctx->expected_protocol)) { TEST_info("Protocol mismatch: expected %s, got %s.\n", - ssl_protocol_name(test_ctx->expected_protocol), - ssl_protocol_name(result->client_protocol)); + ssl_protocol_name(test_ctx->expected_protocol), + ssl_protocol_name(result->client_protocol)); return 0; } } @@ -124,12 +124,12 @@ static int check_protocol(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) static int check_servername(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) { if (!TEST_int_eq(result->servername, test_ctx->expected_servername)) { - TEST_info("Client ServerName mismatch, expected %s, got %s.", - ssl_servername_name(test_ctx->expected_servername), - ssl_servername_name(result->servername)); - return 0; + TEST_info("Client ServerName mismatch, expected %s, got %s.", + ssl_servername_name(test_ctx->expected_servername), + ssl_servername_name(result->servername)); + return 0; } - return 1; + return 1; } static int check_session_ticket(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) @@ -137,10 +137,10 @@ static int check_session_ticket(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx if (test_ctx->session_ticket_expected == SSL_TEST_SESSION_TICKET_IGNORE) return 1; if (!TEST_int_eq(result->session_ticket, - test_ctx->session_ticket_expected)) { + test_ctx->session_ticket_expected)) { TEST_info("Client SessionTicketExpected mismatch, expected %s, got %s.", - ssl_session_ticket_name(test_ctx->session_ticket_expected), - ssl_session_ticket_name(result->session_ticket)); + ssl_session_ticket_name(test_ctx->session_ticket_expected), + ssl_session_ticket_name(result->session_ticket)); return 0; } return 1; @@ -152,8 +152,8 @@ static int check_session_id(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) return 1; if (!TEST_int_eq(result->session_id, test_ctx->session_id_expected)) { TEST_info("Client SessionIdExpected mismatch, expected %s, got %s\n.", - ssl_session_id_name(test_ctx->session_id_expected), - ssl_session_id_name(result->session_id)); + ssl_session_id_name(test_ctx->session_id_expected), + ssl_session_id_name(result->session_id)); return 0; } return 1; @@ -170,10 +170,10 @@ static int check_npn(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) { int ret = 1; if (!TEST_str_eq(result->client_npn_negotiated, - result->server_npn_negotiated)) + result->server_npn_negotiated)) ret = 0; if (!TEST_str_eq(test_ctx->expected_npn_protocol, - result->client_npn_negotiated)) + result->client_npn_negotiated)) ret = 0; return ret; } @@ -183,16 +183,16 @@ static int check_alpn(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) { int ret = 1; if (!TEST_str_eq(result->client_alpn_negotiated, - result->server_alpn_negotiated)) + result->server_alpn_negotiated)) ret = 0; if (!TEST_str_eq(test_ctx->expected_alpn_protocol, - result->client_alpn_negotiated)) + result->client_alpn_negotiated)) ret = 0; return ret; } static int check_session_ticket_app_data(HANDSHAKE_RESULT *result, - SSL_TEST_CTX *test_ctx) + SSL_TEST_CTX *test_ctx) { size_t result_len = 0; size_t expected_len = 0; @@ -206,7 +206,7 @@ static int check_session_ticket_app_data(HANDSHAKE_RESULT *result, return 1; if (!TEST_str_eq(result->result_session_ticket_app_data, - test_ctx->expected_session_ticket_app_data)) + test_ctx->expected_session_ticket_app_data)) return 0; return 1; @@ -226,8 +226,8 @@ static int check_nid(const char *name, int expected_nid, int nid) if (expected_nid == 0 || expected_nid == nid) return 1; TEST_error("%s type mismatch, %s vs %s\n", - name, OBJ_nid2ln(expected_nid), - nid == NID_undef ? "absent" : OBJ_nid2ln(nid)); + name, OBJ_nid2ln(expected_nid), + nid == NID_undef ? "absent" : OBJ_nid2ln(nid)); return 0; } @@ -241,14 +241,14 @@ static void print_ca_names(STACK_OF(X509_NAME) *names) } for (i = 0; i < sk_X509_NAME_num(names); i++) { X509_NAME_print_ex(bio_err, sk_X509_NAME_value(names, i), 4, - XN_FLAG_ONELINE); + XN_FLAG_ONELINE); BIO_puts(bio_err, "\n"); } } static int check_ca_names(const char *name, - STACK_OF(X509_NAME) *expected_names, - STACK_OF(X509_NAME) *names) + STACK_OF(X509_NAME) *expected_names, + STACK_OF(X509_NAME) *names) { int i; @@ -263,8 +263,8 @@ static int check_ca_names(const char *name, goto err; for (i = 0; i < sk_X509_NAME_num(names); i++) { if (!TEST_int_eq(X509_NAME_cmp(sk_X509_NAME_value(names, i), - sk_X509_NAME_value(expected_names, i)), - 0)) { + sk_X509_NAME_value(expected_names, i)), + 0)) { goto err; } } @@ -281,65 +281,65 @@ err: static int check_tmp_key(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) { return check_nid("Tmp key", test_ctx->expected_tmp_key_type, - result->tmp_key_type); + result->tmp_key_type); } static int check_server_cert_type(HANDSHAKE_RESULT *result, - SSL_TEST_CTX *test_ctx) + SSL_TEST_CTX *test_ctx) { return check_nid("Server certificate", test_ctx->expected_server_cert_type, - result->server_cert_type); + result->server_cert_type); } static int check_server_sign_hash(HANDSHAKE_RESULT *result, - SSL_TEST_CTX *test_ctx) + SSL_TEST_CTX *test_ctx) { return check_nid("Server signing hash", test_ctx->expected_server_sign_hash, - result->server_sign_hash); + result->server_sign_hash); } static int check_server_sign_type(HANDSHAKE_RESULT *result, - SSL_TEST_CTX *test_ctx) + SSL_TEST_CTX *test_ctx) { return check_nid("Server signing", test_ctx->expected_server_sign_type, - result->server_sign_type); + result->server_sign_type); } static int check_server_ca_names(HANDSHAKE_RESULT *result, - SSL_TEST_CTX *test_ctx) + SSL_TEST_CTX *test_ctx) { return check_ca_names("Server CA names", - test_ctx->expected_server_ca_names, - result->server_ca_names); + test_ctx->expected_server_ca_names, + result->server_ca_names); } static int check_client_cert_type(HANDSHAKE_RESULT *result, - SSL_TEST_CTX *test_ctx) + SSL_TEST_CTX *test_ctx) { return check_nid("Client certificate", test_ctx->expected_client_cert_type, - result->client_cert_type); + result->client_cert_type); } static int check_client_sign_hash(HANDSHAKE_RESULT *result, - SSL_TEST_CTX *test_ctx) + SSL_TEST_CTX *test_ctx) { return check_nid("Client signing hash", test_ctx->expected_client_sign_hash, - result->client_sign_hash); + result->client_sign_hash); } static int check_client_sign_type(HANDSHAKE_RESULT *result, - SSL_TEST_CTX *test_ctx) + SSL_TEST_CTX *test_ctx) { return check_nid("Client signing", test_ctx->expected_client_sign_type, - result->client_sign_type); + result->client_sign_type); } static int check_client_ca_names(HANDSHAKE_RESULT *result, - SSL_TEST_CTX *test_ctx) + SSL_TEST_CTX *test_ctx) { return check_ca_names("Client CA names", - test_ctx->expected_client_ca_names, - result->client_ca_names); + test_ctx->expected_client_ca_names, + result->client_ca_names); } static int check_cipher(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) @@ -349,7 +349,7 @@ static int check_cipher(HANDSHAKE_RESULT *result, SSL_TEST_CTX *test_ctx) if (!TEST_ptr(result->cipher)) return 0; if (!TEST_str_eq(test_ctx->expected_cipher, - result->cipher)) + result->cipher)) return 0; return 1; } @@ -395,7 +395,7 @@ static int test_handshake(int idx) { int ret = 0; SSL_CTX *server_ctx = NULL, *server2_ctx = NULL, *client_ctx = NULL, - *resume_server_ctx = NULL, *resume_client_ctx = NULL; + *resume_server_ctx = NULL, *resume_client_ctx = NULL; SSL_TEST_CTX *test_ctx = NULL; HANDSHAKE_RESULT *result = NULL; char test_app[MAX_TESTCASE_NAME_LENGTH]; @@ -408,24 +408,22 @@ static int test_handshake(int idx) /* Verify that the FIPS provider supports this test */ if (test_ctx->fips_version != NULL - && !fips_provider_version_match(libctx, test_ctx->fips_version)) { - ret = TEST_skip("FIPS provider unable to run this test"); - goto err; + && !fips_provider_version_match(libctx, test_ctx->fips_version)) { + ret = TEST_skip("FIPS provider unable to run this test"); + goto err; } #ifndef OPENSSL_NO_DTLS if (test_ctx->method == SSL_TEST_METHOD_DTLS) { server_ctx = SSL_CTX_new_ex(libctx, NULL, DTLS_server_method()); if (!TEST_true(SSL_CTX_set_options(server_ctx, - SSL_OP_ALLOW_CLIENT_RENEGOTIATION)) - || !TEST_true(SSL_CTX_set_max_proto_version(server_ctx, 0))) + SSL_OP_ALLOW_CLIENT_RENEGOTIATION)) + || !TEST_true(SSL_CTX_set_max_proto_version(server_ctx, 0))) goto err; - if (test_ctx->extra.server.servername_callback != - SSL_TEST_SERVERNAME_CB_NONE) { - if (!TEST_ptr(server2_ctx = - SSL_CTX_new_ex(libctx, NULL, DTLS_server_method())) - || !TEST_true(SSL_CTX_set_options(server2_ctx, - SSL_OP_ALLOW_CLIENT_RENEGOTIATION))) + if (test_ctx->extra.server.servername_callback != SSL_TEST_SERVERNAME_CB_NONE) { + if (!TEST_ptr(server2_ctx = SSL_CTX_new_ex(libctx, NULL, DTLS_server_method())) + || !TEST_true(SSL_CTX_set_options(server2_ctx, + SSL_OP_ALLOW_CLIENT_RENEGOTIATION))) goto err; } client_ctx = SSL_CTX_new_ex(libctx, NULL, DTLS_client_method()); @@ -433,24 +431,24 @@ static int test_handshake(int idx) goto err; if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME) { resume_server_ctx = SSL_CTX_new_ex(libctx, NULL, - DTLS_server_method()); + DTLS_server_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx, 0)) - || !TEST_true(SSL_CTX_set_options(resume_server_ctx, - SSL_OP_ALLOW_CLIENT_RENEGOTIATION))) + || !TEST_true(SSL_CTX_set_options(resume_server_ctx, + SSL_OP_ALLOW_CLIENT_RENEGOTIATION))) goto err; resume_client_ctx = SSL_CTX_new_ex(libctx, NULL, - DTLS_client_method()); + DTLS_client_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx, 0))) goto err; if (!TEST_ptr(resume_server_ctx) - || !TEST_ptr(resume_client_ctx)) + || !TEST_ptr(resume_client_ctx)) goto err; } } #endif if (test_ctx->method == SSL_TEST_METHOD_TLS) { #if !defined(OPENSSL_NO_TLS1_3) \ - && defined(OPENSSL_NO_EC) \ + && defined(OPENSSL_NO_EC) \ && defined(OPENSSL_NO_DH) /* Without ec or dh there are no built-in groups for TLSv1.3 */ int maxversion = TLS1_2_VERSION; @@ -460,19 +458,17 @@ static int test_handshake(int idx) server_ctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(server_ctx, maxversion)) - || !TEST_true(SSL_CTX_set_options(server_ctx, - SSL_OP_ALLOW_CLIENT_RENEGOTIATION))) + || !TEST_true(SSL_CTX_set_options(server_ctx, + SSL_OP_ALLOW_CLIENT_RENEGOTIATION))) goto err; /* SNI on resumption isn't supported/tested yet. */ - if (test_ctx->extra.server.servername_callback != - SSL_TEST_SERVERNAME_CB_NONE) { - if (!TEST_ptr(server2_ctx = - SSL_CTX_new_ex(libctx, NULL, TLS_server_method())) - || !TEST_true(SSL_CTX_set_options(server2_ctx, - SSL_OP_ALLOW_CLIENT_RENEGOTIATION))) + if (test_ctx->extra.server.servername_callback != SSL_TEST_SERVERNAME_CB_NONE) { + if (!TEST_ptr(server2_ctx = SSL_CTX_new_ex(libctx, NULL, TLS_server_method())) + || !TEST_true(SSL_CTX_set_options(server2_ctx, + SSL_OP_ALLOW_CLIENT_RENEGOTIATION))) goto err; if (!TEST_true(SSL_CTX_set_max_proto_version(server2_ctx, - maxversion))) + maxversion))) goto err; } client_ctx = SSL_CTX_new_ex(libctx, NULL, TLS_client_method()); @@ -481,19 +477,19 @@ static int test_handshake(int idx) if (test_ctx->handshake_mode == SSL_TEST_HANDSHAKE_RESUME) { resume_server_ctx = SSL_CTX_new_ex(libctx, NULL, - TLS_server_method()); + TLS_server_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(resume_server_ctx, - maxversion)) - || !TEST_true(SSL_CTX_set_options(resume_server_ctx, - SSL_OP_ALLOW_CLIENT_RENEGOTIATION))) + maxversion)) + || !TEST_true(SSL_CTX_set_options(resume_server_ctx, + SSL_OP_ALLOW_CLIENT_RENEGOTIATION))) goto err; resume_client_ctx = SSL_CTX_new_ex(libctx, NULL, - TLS_client_method()); + TLS_client_method()); if (!TEST_true(SSL_CTX_set_max_proto_version(resume_client_ctx, - maxversion))) + maxversion))) goto err; if (!TEST_ptr(resume_server_ctx) - || !TEST_ptr(resume_client_ctx)) + || !TEST_ptr(resume_client_ctx)) goto err; } } @@ -504,8 +500,8 @@ static int test_handshake(int idx) #endif if (!TEST_ptr(server_ctx) - || !TEST_ptr(client_ctx) - || !TEST_int_gt(CONF_modules_load(conf, test_app, 0), 0)) + || !TEST_ptr(client_ctx) + || !TEST_int_gt(CONF_modules_load(conf, test_app, 0), 0)) goto err; if (!SSL_CTX_config(server_ctx, "server") @@ -527,7 +523,7 @@ static int test_handshake(int idx) goto err; result = do_handshake(server_ctx, server2_ctx, client_ctx, - resume_server_ctx, resume_client_ctx, test_ctx); + resume_server_ctx, resume_client_ctx, test_ctx); if (result != NULL) ret = check_test(result, test_ctx); @@ -557,10 +553,11 @@ int setup_tests(void) } if (!TEST_ptr(conf = NCONF_new(NULL)) - /* argv[1] should point to the test conf file */ - || !TEST_int_gt(NCONF_load(conf, test_get_argument(0), NULL), 0) - || !TEST_int_ne(NCONF_get_number_e(conf, NULL, "num_tests", - &num_tests), 0)) { + /* argv[1] should point to the test conf file */ + || !TEST_int_gt(NCONF_load(conf, test_get_argument(0), NULL), 0) + || !TEST_int_ne(NCONF_get_number_e(conf, NULL, "num_tests", + &num_tests), + 0)) { TEST_error("usage: ssl_test %s", USAGE); return 0; } |