diff options
| author | Pauli <paul.dale@oracle.com> | 2017-08-21 10:37:34 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-08-21 10:37:34 +1000 |
| commit | 045fe7313a672630881df277321052442bfaca73 (patch) | |
| tree | 755f4909db088b6e48b0092e0c712bf2555b5320 | |
| parent | 72460149dbb6c13b073c2ac8b70df816ef362679 (diff) | |
| download | openssl-045fe7313a672630881df277321052442bfaca73.tar.gz | |
Remove double error messages
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4204)
| -rw-r--r-- | test/ssl_test_ctx.c | 18 |
1 files 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) { |