summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2024-08-30 17:06:26 +0200
committerTomas Mraz <tomas@openssl.org>2024-09-02 10:26:45 +0200
commit16e7da091c67e072b6927fcbf8637824bfd13f83 (patch)
tree03705e399743840f260292f5b2dfc17dcb846247 /crypto
parentDetect MinGW 32 bit for NO_INTERLOCKEDOR64 (diff)
downloadopenssl-16e7da091c67e072b6927fcbf8637824bfd13f83.tar.xz
openssl-16e7da091c67e072b6927fcbf8637824bfd13f83.zip
Missing .rodata for AVX2/AVX512 codepaths
This is a follow-up to #23997 Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25340)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/bn/asm/rsaz-2k-avx512.pl4
-rw-r--r--crypto/bn/asm/rsaz-3k-avx512.pl4
-rw-r--r--crypto/bn/asm/rsaz-4k-avx512.pl4
-rwxr-xr-xcrypto/bn/asm/rsaz-avx2.pl2
-rw-r--r--crypto/modes/asm/aes-gcm-avx512.pl2
5 files changed, 9 insertions, 7 deletions
diff --git a/crypto/bn/asm/rsaz-2k-avx512.pl b/crypto/bn/asm/rsaz-2k-avx512.pl
index 7ee02778df..24fcebcfd1 100644
--- a/crypto/bn/asm/rsaz-2k-avx512.pl
+++ b/crypto/bn/asm/rsaz-2k-avx512.pl
@@ -393,7 +393,7 @@ $code.=<<___;
___
$code.=<<___;
-.data
+.section .rodata align=32
.align 32
.Lmask52x4:
.quad 0xfffffffffffff
@@ -589,7 +589,7 @@ $code.=<<___;
.size ossl_extract_multiplier_2x20_win5, .-ossl_extract_multiplier_2x20_win5
___
$code.=<<___;
-.data
+.section .rodata align=32
.align 32
.Lones:
.quad 1,1,1,1
diff --git a/crypto/bn/asm/rsaz-3k-avx512.pl b/crypto/bn/asm/rsaz-3k-avx512.pl
index 8ed5496479..e8713864e8 100644
--- a/crypto/bn/asm/rsaz-3k-avx512.pl
+++ b/crypto/bn/asm/rsaz-3k-avx512.pl
@@ -485,7 +485,7 @@ $code.=<<___;
___
$code.=<<___;
-.data
+.section .rodata align=32
.align 32
.Lmask52x4:
.quad 0xfffffffffffff
@@ -730,7 +730,7 @@ $code.=<<___;
.size ossl_extract_multiplier_2x30_win5, .-ossl_extract_multiplier_2x30_win5
___
$code.=<<___;
-.data
+.section .rodata align=32
.align 32
.Lones:
.quad 1,1,1,1
diff --git a/crypto/bn/asm/rsaz-4k-avx512.pl b/crypto/bn/asm/rsaz-4k-avx512.pl
index 8c59b77f77..381c08b0fb 100644
--- a/crypto/bn/asm/rsaz-4k-avx512.pl
+++ b/crypto/bn/asm/rsaz-4k-avx512.pl
@@ -526,7 +526,7 @@ $code.=<<___;
___
$code.=<<___;
-.data
+.section .rodata align=32
.align 32
.Lmask52x4:
.quad 0xfffffffffffff
@@ -786,7 +786,7 @@ $code.=<<___;
.size ossl_extract_multiplier_2x40_win5, .-ossl_extract_multiplier_2x40_win5
___
$code.=<<___;
-.data
+.section .rodata align=32
.align 32
.Lones:
.quad 1,1,1,1
diff --git a/crypto/bn/asm/rsaz-avx2.pl b/crypto/bn/asm/rsaz-avx2.pl
index 3d0e342a6b..78e0ca21d3 100755
--- a/crypto/bn/asm/rsaz-avx2.pl
+++ b/crypto/bn/asm/rsaz-avx2.pl
@@ -1779,6 +1779,7 @@ $code.=<<___;
ret
.size rsaz_avx2_eligible,.-rsaz_avx2_eligible
+.section .rodata align=64
.align 64
.Land_mask:
.quad 0x1fffffff,0x1fffffff,0x1fffffff,0x1fffffff
@@ -1790,6 +1791,7 @@ $code.=<<___;
.long 0,0,0,0, 1,1,1,1
.long 2,2,2,2, 3,3,3,3
.long 4,4,4,4, 4,4,4,4
+.previous
.align 64
___
diff --git a/crypto/modes/asm/aes-gcm-avx512.pl b/crypto/modes/asm/aes-gcm-avx512.pl
index e150c9aa05..d6e5b21b36 100644
--- a/crypto/modes/asm/aes-gcm-avx512.pl
+++ b/crypto/modes/asm/aes-gcm-avx512.pl
@@ -4812,7 +4812,7 @@ ___
}
$code .= <<___;
-.data
+.section .rodata align=16
.align 16
POLY: .quad 0x0000000000000001, 0xC200000000000000