From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Fri, 29 Apr 2022 12:22:24 +0000 (+0200)
Subject: Improving locale test
X-Git-Tag: openssl-3.2.0-alpha1~2724
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93983e555531a8d9bf70d12e4cfdb5ce2f337e3b;p=thirdparty%2Fopenssl.git

Improving locale test

Fixes #18205

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18211)
---

diff --git a/test/localetest.c b/test/localetest.c
index 3db66b7a9e5..ea80039b3b8 100644
--- a/test/localetest.c
+++ b/test/localetest.c
@@ -91,12 +91,14 @@ int setup_tests(void)
     X509_PUBKEY *cert_pubkey = NULL;
     const unsigned char *p = der_bytes;
 
-    TEST_ptr(setlocale(LC_ALL, ""));
+    if (setlocale(LC_ALL, "") == NULL)
+        return TEST_skip("Cannot set the locale necessary for test");
 
     res = strcasecmp(str1, str2);
     TEST_note("Case-insensitive comparison via strcasecmp in current locale %s\n", res ? "failed" : "succeeded");
 
-    TEST_false(OPENSSL_strcasecmp(str1, str2));
+    if (!TEST_false(OPENSSL_strcasecmp(str1, str2)))
+        return 0;
 
     cert = d2i_X509(NULL, &p, sizeof(der_bytes));
     if (!TEST_ptr(cert))