mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 02:29:01 +08:00
db0f4e665e
Follow-up from #33890, tentative arm-neon-android asm patch. Patch submitted upstream: https://github.com/openssl/openssl/pull/22181, tagged "severity: fips change".
97 lines
2.6 KiB
Diff
97 lines
2.6 KiB
Diff
diff --git a/crypto/armv4cpuid.pl b/crypto/armv4cpuid.pl
|
|
index 04b342551c..9b933c70c4 100644
|
|
--- a/crypto/armv4cpuid.pl
|
|
+++ b/crypto/armv4cpuid.pl
|
|
@@ -293,6 +293,7 @@ atomic_add_spinlock:
|
|
#endif
|
|
|
|
.extern OPENSSL_armcap_P
|
|
+.hidden OPENSSL_armcap_P
|
|
___
|
|
|
|
print $code;
|
|
diff --git a/crypto/bn/asm/armv4-gf2m.pl b/crypto/bn/asm/armv4-gf2m.pl
|
|
index 17af0e0774..5733a01746 100644
|
|
--- a/crypto/bn/asm/armv4-gf2m.pl
|
|
+++ b/crypto/bn/asm/armv4-gf2m.pl
|
|
@@ -326,6 +326,7 @@ $code.=<<___;
|
|
|
|
#if __ARM_MAX_ARCH__>=7
|
|
.extern OPENSSL_armcap_P
|
|
+.hidden OPENSSL_armcap_P
|
|
#endif
|
|
___
|
|
|
|
diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl
|
|
index d85da92406..6e839d845c 100644
|
|
--- a/crypto/bn/asm/armv4-mont.pl
|
|
+++ b/crypto/bn/asm/armv4-mont.pl
|
|
@@ -750,6 +750,7 @@ $code.=<<___;
|
|
.align 2
|
|
#if __ARM_MAX_ARCH__>=7
|
|
.extern OPENSSL_armcap_P
|
|
+.hidden OPENSSL_armcap_P
|
|
#endif
|
|
___
|
|
|
|
diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl
|
|
index ac32d5bda7..bb48b6eeb9 100755
|
|
--- a/crypto/chacha/asm/chacha-armv4.pl
|
|
+++ b/crypto/chacha/asm/chacha-armv4.pl
|
|
@@ -1155,6 +1155,7 @@ $code.=<<___;
|
|
ldmia sp!,{r4-r11,pc}
|
|
.size ChaCha20_neon,.-ChaCha20_neon
|
|
.extern OPENSSL_armcap_P
|
|
+.hidden OPENSSL_armcap_P
|
|
#endif
|
|
___
|
|
}}}
|
|
diff --git a/crypto/poly1305/asm/poly1305-armv4.pl b/crypto/poly1305/asm/poly1305-armv4.pl
|
|
index b98beefa18..673ea62ec3 100755
|
|
--- a/crypto/poly1305/asm/poly1305-armv4.pl
|
|
+++ b/crypto/poly1305/asm/poly1305-armv4.pl
|
|
@@ -1240,6 +1240,7 @@ $code.=<<___;
|
|
.align 2
|
|
#if __ARM_MAX_ARCH__>=7
|
|
.extern OPENSSL_armcap_P
|
|
+.hidden OPENSSL_armcap_P
|
|
#endif
|
|
___
|
|
|
|
diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl
|
|
index 2832c5b530..b3a8ec6941 100644
|
|
--- a/crypto/sha/asm/sha1-armv4-large.pl
|
|
+++ b/crypto/sha/asm/sha1-armv4-large.pl
|
|
@@ -708,6 +708,7 @@ ___
|
|
$code.=<<___;
|
|
#if __ARM_MAX_ARCH__>=7
|
|
.extern OPENSSL_armcap_P
|
|
+.hidden OPENSSL_armcap_P
|
|
#endif
|
|
___
|
|
|
|
diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
|
|
index 8bac84b1a8..feb1f26109 100644
|
|
--- a/crypto/sha/asm/sha256-armv4.pl
|
|
+++ b/crypto/sha/asm/sha256-armv4.pl
|
|
@@ -694,6 +694,7 @@ $code.=<<___;
|
|
.align 2
|
|
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
|
|
.extern OPENSSL_armcap_P
|
|
+.hidden OPENSSL_armcap_P
|
|
#endif
|
|
___
|
|
|
|
diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl
|
|
index c8b8110671..9aa310ffd0 100644
|
|
--- a/crypto/sha/asm/sha512-armv4.pl
|
|
+++ b/crypto/sha/asm/sha512-armv4.pl
|
|
@@ -661,6 +661,7 @@ $code.=<<___;
|
|
.align 2
|
|
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
|
|
.extern OPENSSL_armcap_P
|
|
+.hidden OPENSSL_armcap_P
|
|
#endif
|
|
___
|
|
|