From eb72d17d580445c364a2dfb2d637026a00e779eb Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Sat, 14 Jan 2023 16:58:56 +0000
Subject: Move constants out of text segment into rodata to prepare for xonly
 support on amd64.  no pic handling is neccessary since amd64 has full reach.
 ok kettenis

---
 src/lib/libcrypto/bn/asm/x86_64-gf2m.pl  | 1 -
 src/lib/libcrypto/bn/asm/x86_64-mont.pl  | 4 ----
 src/lib/libcrypto/bn/asm/x86_64-mont5.pl | 3 ++-
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/lib/libcrypto/bn')

diff --git a/src/lib/libcrypto/bn/asm/x86_64-gf2m.pl b/src/lib/libcrypto/bn/asm/x86_64-gf2m.pl
index 24dacb1e9c..6985725b20 100644
--- a/src/lib/libcrypto/bn/asm/x86_64-gf2m.pl
+++ b/src/lib/libcrypto/bn/asm/x86_64-gf2m.pl
@@ -277,7 +277,6 @@ $code.=<<___;
 	ret
 .Lend_mul_2x2:
 .size	bn_GF2m_mul_2x2,.-bn_GF2m_mul_2x2
-.asciz	"GF(2^m) Multiplication for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
 .align	16
 ___
 
diff --git a/src/lib/libcrypto/bn/asm/x86_64-mont.pl b/src/lib/libcrypto/bn/asm/x86_64-mont.pl
index c35493e80a..cae7309d5b 100755
--- a/src/lib/libcrypto/bn/asm/x86_64-mont.pl
+++ b/src/lib/libcrypto/bn/asm/x86_64-mont.pl
@@ -1495,10 +1495,6 @@ $code.=<<___;
 .size	bn_sqr4x_mont,.-bn_sqr4x_mont
 ___
 }}}
-$code.=<<___;
-.asciz	"Montgomery Multiplication for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
-.align	16
-___
 
 print $code;
 close STDOUT;
diff --git a/src/lib/libcrypto/bn/asm/x86_64-mont5.pl b/src/lib/libcrypto/bn/asm/x86_64-mont5.pl
index bb7ad4c4b7..5d30f210ce 100755
--- a/src/lib/libcrypto/bn/asm/x86_64-mont5.pl
+++ b/src/lib/libcrypto/bn/asm/x86_64-mont5.pl
@@ -1032,11 +1032,12 @@ $code.=<<___;
 ___
 }
 $code.=<<___;
+.rodata
 .align	64
 .Linc:
 	.long	0,0, 1,1
 	.long	2,2, 2,2
-.asciz	"Montgomery Multiplication with scatter/gather for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
+.previous
 ___
 
 # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame,
-- 
cgit v1.2.3-55-g6feb