提交 d972af2b 编写于 作者: E Emilia Kasper

Make boolean SSL test conf values case-insensitive

Undo review mistake: I changed the wrong strcmp in a previous pull
request. Add test.
Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 bd19d1aa
...@@ -333,11 +333,11 @@ const char *ssl_handshake_mode_name(ssl_handshake_mode_t mode) ...@@ -333,11 +333,11 @@ const char *ssl_handshake_mode_name(ssl_handshake_mode_t mode)
static int parse_boolean(const char *value, int *result) static int parse_boolean(const char *value, int *result)
{ {
if (strcmp(value, "Yes") == 0) { if (strcasecmp(value, "Yes") == 0) {
*result = 1; *result = 1;
return 1; return 1;
} }
else if (strcmp(value, "No") == 0) { else if (strcasecmp(value, "No") == 0) {
*result = 0; *result = 0;
return 1; return 1;
} }
...@@ -427,7 +427,7 @@ SSL_TEST_CTX *SSL_TEST_CTX_create(const CONF *conf, const char *test_section) ...@@ -427,7 +427,7 @@ SSL_TEST_CTX *SSL_TEST_CTX_create(const CONF *conf, const char *test_section)
int found = 0; int found = 0;
const CONF_VALUE *option = sk_CONF_VALUE_value(sk_conf, i); const CONF_VALUE *option = sk_CONF_VALUE_value(sk_conf, i);
for (j = 0; j < OSSL_NELEM(ssl_test_ctx_options); j++) { for (j = 0; j < OSSL_NELEM(ssl_test_ctx_options); j++) {
if (strcasecmp(option->name, ssl_test_ctx_options[j].name) == 0) { if (strcmp(option->name, ssl_test_ctx_options[j].name) == 0) {
if (!ssl_test_ctx_options[j].parse(ctx, option->value)) { if (!ssl_test_ctx_options[j].parse(ctx, option->value)) {
fprintf(stderr, "Bad value %s for option %s\n", fprintf(stderr, "Bad value %s for option %s\n",
option->value, option->name); option->value, option->name);
......
...@@ -13,7 +13,7 @@ Method = DTLS ...@@ -13,7 +13,7 @@ Method = DTLS
ClientNPNProtocols = foo,bar ClientNPNProtocols = foo,bar
Server2ALPNProtocols = baz Server2ALPNProtocols = baz
HandshakeMode = Resume HandshakeMode = Resume
ResumptionExpected = Yes ResumptionExpected = yes
[ssltest_unknown_option] [ssltest_unknown_option]
UnknownOption = Foo UnknownOption = Foo
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册