From f73069c288cf93e137bf25cfb7a9903d4c67f020 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 29 Mar 2024 01:24:07 +0000
Subject: Stop building whirlpool assembly on amd64 and i386.

This is a legacy algorithm and the assembly is only marginally faster than
the C code.

Discussed with beck@ and tb@
---
 src/lib/libcrypto/arch/amd64/Makefile.inc | 5 ++---
 src/lib/libcrypto/arch/i386/Makefile.inc  | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index 2dcf64d045..8ae28f16e9 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.20 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.21 2024/03/29 01:24:07 jsing Exp $
 
 # amd64-specific libcrypto build rules
 
@@ -67,8 +67,7 @@ sha512-x86_64.S: ${LCRYPTO_SRC}/sha/asm/sha512-x86_64.pl ${EXTRA_PL}
 	cd ${LCRYPTO_SRC}/sha/asm ; \
 		/usr/bin/perl ./sha512-x86_64.pl ${.OBJDIR}/${.TARGET}
 # whrlpool
-CFLAGS+= -DWHIRLPOOL_ASM
-SSLASM+= whrlpool wp-x86_64
+SRCS+= wp_block.c
 
 .for dir f in ${SSLASM}
 SRCS+=	${f}.S
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index 5741bc6f3b..9da377a3c6 100644
--- a/src/lib/libcrypto/arch/i386/Makefile.inc
+++ b/src/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.17 2024/03/28 12:52:58 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.18 2024/03/29 01:24:07 jsing Exp $
 
 # i386-specific libcrypto build rules
 
@@ -39,8 +39,6 @@ CFLAGS+= -DSHA512_ASM
 SSLASM+= sha sha512-586
 # whrlpool
 SRCS+= wp_block.c
-CFLAGS+= -DWHIRLPOOL_ASM
-SSLASM+= whrlpool wp-mmx
 
 .for dir f in ${SSLASM}
 SRCS+=	${f}.S
-- 
cgit v1.2.3-55-g6feb