From 4e1fab63a267fba43456f4cf3909f8d17ca6aee7 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 29 Jan 2023 14:00:41 +0000
Subject: Use s2n-bignum assembly implementations for libcrypto bignum on
 amd64.

This switches the core bignum assembly implementations from x86_64-gcc.c to
s2n-bignum for amd64.

ok miod@ tb@
---
 src/lib/libcrypto/arch/amd64/Makefile.inc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index 1fd9f68919..5e433b572d 100644
--- a/src/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/src/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.10 2023/01/21 17:29:56 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.11 2023/01/29 14:00:41 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -29,7 +29,16 @@ SSLASM+= bn x86_64-gf2m
 
 # bn s2n-bignum
 SRCS += bn_arch.c
+SRCS += bignum_add.S
+SRCS += bignum_cmadd.S
+SRCS += bignum_cmul.S
+SRCS += bignum_mul.S
+SRCS += bignum_mul_4_8_alt.S
+SRCS += bignum_mul_8_16_alt.S
 SRCS += bignum_sqr.S
+SRCS += bignum_sqr_4_8_alt.S
+SRCS += bignum_sqr_8_16_alt.S
+SRCS += bignum_sub.S
 
 # camellia
 SRCS+=	cmll_misc.c
@@ -75,7 +84,7 @@ ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl ${EXTRA_PL}
 .endfor
 
 CFLAGS+= -DOPENSSL_CPUID_OBJ
-SRCS+=	x86_64cpuid.S x86_64-gcc.c
+SRCS+=	x86_64cpuid.S
 GENERATED+=x86_64cpuid.S
 
 x86_64cpuid.S: ${LCRYPTO_SRC}/x86_64cpuid.pl ${EXTRA_PL}
-- 
cgit v1.2.3-55-g6feb