From 0deb411eac3cff8a4881f10ef311f2cf51aac3a3 Mon Sep 17 00:00:00 2001 From: jsing Date: Fri, 29 Mar 2024 01:24:07 +0000 Subject: [PATCH] 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@ --- lib/libcrypto/arch/amd64/Makefile.inc | 5 ++--- lib/libcrypto/arch/i386/Makefile.inc | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/libcrypto/arch/amd64/Makefile.inc b/lib/libcrypto/arch/amd64/Makefile.inc index 2dcf64d045d..8ae28f16e97 100644 --- a/lib/libcrypto/arch/amd64/Makefile.inc +++ b/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/lib/libcrypto/arch/i386/Makefile.inc b/lib/libcrypto/arch/i386/Makefile.inc index 5741bc6f3b4..9da377a3c6d 100644 --- a/lib/libcrypto/arch/i386/Makefile.inc +++ b/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 -- 2.20.1