From: Emilia Kasper <emilia@openssl.org>
Date: Thu, 21 Jul 2016 14:32:07 +0000 (+0200)
Subject: Make boolean SSL test conf values case-insensitive
X-Git-Tag: OpenSSL_1_1_0-pre6~120
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d972af2b5e6b8c266f878ce28e60badcbc402311;p=oweals%2Fopenssl.git

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: Rich Salz <rsalz@openssl.org>
---

diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c
index 8dd63ae7dc..084cf15a85 100644
--- a/test/ssl_test_ctx.c
+++ b/test/ssl_test_ctx.c
@@ -333,11 +333,11 @@ const char *ssl_handshake_mode_name(ssl_handshake_mode_t mode)
 
 static int parse_boolean(const char *value, int *result)
 {
-    if (strcmp(value, "Yes") == 0) {
+    if (strcasecmp(value, "Yes") == 0) {
         *result = 1;
         return 1;
     }
-    else if (strcmp(value, "No") == 0) {
+    else if (strcasecmp(value, "No") == 0) {
         *result = 0;
         return 1;
     }
@@ -427,7 +427,7 @@ SSL_TEST_CTX *SSL_TEST_CTX_create(const CONF *conf, const char *test_section)
         int found = 0;
         const CONF_VALUE *option = sk_CONF_VALUE_value(sk_conf, i);
         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)) {
                     fprintf(stderr, "Bad value %s for option %s\n",
                             option->value, option->name);
diff --git a/test/ssl_test_ctx_test.conf b/test/ssl_test_ctx_test.conf
index 1f76155b37..eacf58a9ed 100644
--- a/test/ssl_test_ctx_test.conf
+++ b/test/ssl_test_ctx_test.conf
@@ -13,7 +13,7 @@ Method = DTLS
 ClientNPNProtocols = foo,bar
 Server2ALPNProtocols = baz
 HandshakeMode = Resume
-ResumptionExpected = Yes
+ResumptionExpected = yes
 
 [ssltest_unknown_option]
 UnknownOption = Foo