From 15d5545d9c99970c4f30d3c0c9626aa3e6df02f4 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 29 Mar 2024 07:06:21 +0000
Subject: 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@
---
 src/lib/libcrypto/arch/amd64/Makefile.inc | 7 ++++---
 src/lib/libcrypto/arch/i386/Makefile.inc  | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc
index 1562e7ec76..b7dd4ad1e9 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.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/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc
index 934da3ef7e..2a754a5e8f 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.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
-- 
cgit v1.2.3-55-g6feb