From f74368955fecec45d0769ec147575d3d1363a827 Mon Sep 17 00:00:00 2001 From: jsing Date: Fri, 29 Mar 2024 07:06:21 +0000 Subject: [PATCH] Stop building camellia 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 | 7 ++++--- lib/libcrypto/arch/i386/Makefile.inc | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/libcrypto/arch/amd64/Makefile.inc b/lib/libcrypto/arch/amd64/Makefile.inc index 1562e7ec76d..b7dd4ad1e92 100644 --- a/lib/libcrypto/arch/amd64/Makefile.inc +++ b/lib/libcrypto/arch/amd64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.24 2024/03/29 06:03:20 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.25 2024/03/29 07:06:21 jsing Exp $ # amd64-specific libcrypto build rules @@ -40,8 +40,9 @@ SRCS += bignum_sub.S SRCS += word_clz.S # camellia -SRCS+= cmll_misc.c -SSLASM+= camellia cmll-x86_64 +SRCS+= camellia.c +SRCS+= cmll_cbc.c +SRCS+= cmll_misc.c # md5 CFLAGS+= -DMD5_ASM SSLASM+= md5 md5-x86_64 diff --git a/lib/libcrypto/arch/i386/Makefile.inc b/lib/libcrypto/arch/i386/Makefile.inc index 934da3ef7e0..2a754a5e8fb 100644 --- a/lib/libcrypto/arch/i386/Makefile.inc +++ b/lib/libcrypto/arch/i386/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.21 2024/03/29 06:03:21 jsing Exp $ +# $OpenBSD: Makefile.inc,v 1.22 2024/03/29 07:06:21 jsing Exp $ # i386-specific libcrypto build rules @@ -21,7 +21,9 @@ SSLASM+= bn co-586 CFLAGS+= -DOPENSSL_BN_ASM_MONT SSLASM+= bn x86-mont # camellia -SSLASM+= camellia cmll-x86 +SRCS+= camellia.c +SRCS+= cmll_cbc.c +SRCS+= cmll_misc.c # md5 CFLAGS+= -DMD5_ASM SSLASM+= md5 md5-586 -- 2.20.1