raven/base/openssl3/0056-strcasecmp.patch

58 lines
2.2 KiB
Diff
Raw Normal View History

2024-02-21 13:47:54 +06:00
diff -Naur a/crypto/o_str.c b/crypto/o_str.c
--- a/crypto/o_str.c 2023-10-24 19:48:41.000000000 +0600
+++ b/crypto/o_str.c 2023-10-25 11:29:25.027777172 +0600
@@ -342,7 +342,12 @@
#endif
}
-int OPENSSL_strcasecmp(const char *s1, const char *s2)
+int
+#ifndef FIPS_MODULE
+__attribute__ ((symver ("OPENSSL_strcasecmp@@OPENSSL_3.0.3"),
+ symver ("OPENSSL_strcasecmp@OPENSSL_3.0.1")))
+#endif
+OPENSSL_strcasecmp(const char *s1, const char *s2)
{
int t;
@@ -352,7 +357,12 @@
return t;
}
-int OPENSSL_strncasecmp(const char *s1, const char *s2, size_t n)
+int
+#ifndef FIPS_MODULE
+__attribute__ ((symver ("OPENSSL_strncasecmp@@OPENSSL_3.0.3"),
+ symver ("OPENSSL_strncasecmp@OPENSSL_3.0.1")))
+#endif
+OPENSSL_strncasecmp(const char *s1, const char *s2, size_t n)
{
int t;
size_t i;
diff -Naur a/test/recipes/01-test_symbol_presence.t b/test/recipes/01-test_symbol_presence.t
--- a/test/recipes/01-test_symbol_presence.t 2023-10-24 19:48:41.000000000 +0600
+++ b/test/recipes/01-test_symbol_presence.t 2023-10-25 11:30:10.370779121 +0600
@@ -88,6 +88,7 @@
s| .*||;
# Drop OpenSSL dynamic version information if there is any
s|\@\@.+$||;
+ s|\@.+$||;
# Return the result
$_
}
diff -Naur a/util/libcrypto.num b/util/libcrypto.num
--- a/util/libcrypto.num 2023-10-25 14:34:52.625097849 +0600
+++ b/util/libcrypto.num 2023-10-25 14:33:41.994089944 +0600
--- a/util/libcrypto.num 2023-10-25 15:37:50.402268734 +0600
+++ b/util/libcrypto.num 2023-10-25 15:40:38.494257454 +0600
@@ -5429,6 +5429,8 @@
OPENSSL_strncasecmp 5557 3_0_3 EXIST::FUNCTION:
OSSL_CMP_CTX_reset_geninfo_ITAVs 5558 3_0_8 EXIST::FUNCTION:CMP
OSSL_CMP_MSG_update_recipNonce 5559 3_0_9 EXIST::FUNCTION:CMP
+OPENSSL_strcasecmp ? 3_0_1 EXIST::FUNCTION:
+OPENSSL_strncasecmp ? 3_0_1 EXIST::FUNCTION:
ossl_safe_getenv ? 3_0_0 EXIST::FUNCTION:
ossl_ctx_legacy_digest_signatures_allowed ? 3_0_1 EXIST::FUNCTION:
ossl_ctx_legacy_digest_signatures_allowed_set ? 3_0_1 EXIST::FUNCTION: