106fe8964c
Rebased to openssl-3.0.7 with corresponding minor bugfixes - C99 compatibility in downstream-only 0032-Force-fips.patch Resolves: rhbz#2152504 - Adjusting include for the FIPS_mode macro Resolves: rhbz#2083876
55 lines
2.3 KiB
Diff
55 lines
2.3 KiB
Diff
diff -up openssl-3.0.3/util/libcrypto.num.locale openssl-3.0.3/util/libcrypto.num
|
|
--- openssl-3.0.3/util/libcrypto.num.locale 2022-06-01 12:35:52.667498724 +0200
|
|
+++ openssl-3.0.3/util/libcrypto.num 2022-06-01 12:36:08.112633093 +0200
|
|
@@ -5425,6 +5425,8 @@ ASN1_item_d2i_ex
|
|
EVP_PKEY_CTX_get0_provider 5555 3_0_0 EXIST::FUNCTION:
|
|
OPENSSL_strcasecmp 5556 3_0_3 EXIST::FUNCTION:
|
|
OPENSSL_strncasecmp 5557 3_0_3 EXIST::FUNCTION:
|
|
+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:
|
|
diff -up openssl-3.0.7/crypto/o_str.c.cmp openssl-3.0.7/crypto/o_str.c
|
|
--- openssl-3.0.7/crypto/o_str.c.cmp 2022-11-25 12:50:22.449760653 +0100
|
|
+++ openssl-3.0.7/crypto/o_str.c 2022-11-25 12:51:19.416350584 +0100
|
|
@@ -342,7 +342,12 @@ int openssl_strerror_r(int errnum, char
|
|
#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 +354,12 @@ int OPENSSL_strcasecmp(const char *s1, c
|
|
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 -up openssl-3.0.7/test/recipes/01-test_symbol_presence.t.cmp openssl-3.0.7/test/recipes/01-test_symbol_presence.t
|
|
--- openssl-3.0.7/test/recipes/01-test_symbol_presence.t.cmp 2022-11-25 18:19:05.669769076 +0100
|
|
+++ openssl-3.0.7/test/recipes/01-test_symbol_presence.t 2022-11-25 18:31:20.993392678 +0100
|
|
@@ -77,6 +80,7 @@ foreach my $libname (@libnames) {
|
|
s| .*||;
|
|
# Drop OpenSSL dynamic version information if there is any
|
|
s|\@\@.+$||;
|
|
+ s|\@.+$||;
|
|
# Return the result
|
|
$_
|
|
}
|