From 045fe7313a672630881df277321052442bfaca73 Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 21 Aug 2017 10:37:34 +1000 Subject: [PATCH 1/1] Remove double error messages Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/4204) --- test/ssl_test_ctx.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c index 4bb4763558..c9b0c43252 100644 --- a/test/ssl_test_ctx.c +++ b/test/ssl_test_ctx.c @@ -756,30 +756,26 @@ SSL_TEST_CTX *SSL_TEST_CTX_create(const CONF *conf, const char *test_section) /* Subsections */ if (strcmp(option->name, "client") == 0) { - if (!parse_client_options(&ctx->extra.client, conf, - option->value)) + if (!parse_client_options(&ctx->extra.client, conf, option->value)) goto err; } else if (strcmp(option->name, "server") == 0) { - if (!TEST_true(parse_server_options(&ctx->extra.server, conf, - option->value))) + if (!parse_server_options(&ctx->extra.server, conf, option->value)) goto err; } else if (strcmp(option->name, "server2") == 0) { - if (!TEST_true(parse_server_options(&ctx->extra.server2, conf, - option->value))) + if (!parse_server_options(&ctx->extra.server2, conf, option->value)) goto err; } else if (strcmp(option->name, "resume-client") == 0) { - if (!TEST_true(parse_client_options(&ctx->resume_extra.client, conf, - option->value))) + if (!parse_client_options(&ctx->resume_extra.client, conf, + option->value)) goto err; } else if (strcmp(option->name, "resume-server") == 0) { - if (!TEST_true(parse_server_options(&ctx->resume_extra.server, conf, - option->value))) + if (!parse_server_options(&ctx->resume_extra.server, conf, + option->value)) goto err; } else if (strcmp(option->name, "resume-server2") == 0) { if (!parse_server_options(&ctx->resume_extra.server2, conf, option->value)) goto err; - } else { for (j = 0; j < OSSL_NELEM(ssl_test_ctx_options); j++) { if (strcmp(option->name, ssl_test_ctx_options[j].name) == 0) { -- 2.34.1