summaryrefslogtreecommitdiff
path: root/lib/libcrypto
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libcrypto')
-rw-r--r--lib/libcrypto/Makefile8
-rw-r--r--lib/libcrypto/arch/aarch64/Makefile.inc5
-rw-r--r--lib/libcrypto/arch/alpha/Makefile.inc4
-rw-r--r--lib/libcrypto/arch/amd64/Makefile.inc6
-rw-r--r--lib/libcrypto/arch/arm/Makefile.inc2
-rw-r--r--lib/libcrypto/arch/hppa/Makefile.inc4
-rw-r--r--lib/libcrypto/arch/i386/Makefile.inc6
-rw-r--r--lib/libcrypto/arch/mips64/Makefile.inc4
-rw-r--r--lib/libcrypto/arch/powerpc/Makefile.inc4
-rw-r--r--lib/libcrypto/arch/powerpc64/Makefile.inc4
-rw-r--r--lib/libcrypto/arch/riscv64/Makefile.inc7
-rw-r--r--lib/libcrypto/arch/sparc64/Makefile.inc4
12 files changed, 14 insertions, 44 deletions
diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile
index 5220a5bdd03..9a50f59a7e5 100644
--- a/lib/libcrypto/Makefile
+++ b/lib/libcrypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.189 2024/03/29 06:03:20 jsing Exp $
+# $OpenBSD: Makefile,v 1.190 2024/03/29 07:24:09 jsing Exp $
LIB= crypto
LIBREBUILD=y
@@ -201,9 +201,12 @@ SRCS+= bs_cbb.c
SRCS+= bs_cbs.c
# camellia/
+SRCS+= camellia.c
+SRCS+= cmll_cbc.c
SRCS+= cmll_cfb.c
SRCS+= cmll_ctr.c
SRCS+= cmll_ecb.c
+SRCS+= cmll_misc.c
SRCS+= cmll_ofb.c
# cast/
@@ -785,9 +788,6 @@ obj_dat.h: obj_mac.h ${SSL_OBJECTS}/obj_dat.pl
.include "${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc"
.else
CFLAGS+=-DOPENSSL_NO_ASM
-SRCS+= camellia.c
-SRCS+= cmll_cbc.c
-SRCS+= cmll_misc.c
.endif
BUILDFIRST = ${GENERATED}
diff --git a/lib/libcrypto/arch/aarch64/Makefile.inc b/lib/libcrypto/arch/aarch64/Makefile.inc
index 75df7f1ea0f..a17ef7f5a99 100644
--- a/lib/libcrypto/arch/aarch64/Makefile.inc
+++ b/lib/libcrypto/arch/aarch64/Makefile.inc
@@ -1,10 +1,7 @@
-# $OpenBSD: Makefile.inc,v 1.12 2024/03/29 06:03:20 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2024/03/29 07:24:09 jsing Exp $
# aarch64-specific libcrypto build rules
-# camellia
-SRCS+= camellia.c cmll_cbc.c cmll_misc.c
-
.for dir f in ${SSLASM}
SRCS+= ${f}.S
GENERATED+=${f}.S
diff --git a/lib/libcrypto/arch/alpha/Makefile.inc b/lib/libcrypto/arch/alpha/Makefile.inc
index ec3f6c5f2b7..3e42c42f5e0 100644
--- a/lib/libcrypto/arch/alpha/Makefile.inc
+++ b/lib/libcrypto/arch/alpha/Makefile.inc
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.13 2024/03/29 06:03:20 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.14 2024/03/29 07:24:09 jsing Exp $
# alpha-specific libcrypto build rules
# bn
SSLASM+= bn alpha-mont
CFLAGS+= -DOPENSSL_BN_ASM_MONT
-# camellia
-SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# modes
CFLAGS+= -DGHASH_ASM
SSLASM+= modes ghash-alpha
diff --git a/lib/libcrypto/arch/amd64/Makefile.inc b/lib/libcrypto/arch/amd64/Makefile.inc
index b7dd4ad1e92..ca7d751d775 100644
--- a/lib/libcrypto/arch/amd64/Makefile.inc
+++ b/lib/libcrypto/arch/amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.25 2024/03/29 07:06:21 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.26 2024/03/29 07:24:09 jsing Exp $
# amd64-specific libcrypto build rules
@@ -39,10 +39,6 @@ SRCS += bignum_sqr_8_16_alt.S
SRCS += bignum_sub.S
SRCS += word_clz.S
-# camellia
-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/arm/Makefile.inc b/lib/libcrypto/arch/arm/Makefile.inc
index bd443dd4d3f..a614add80c4 100644
--- a/lib/libcrypto/arch/arm/Makefile.inc
+++ b/lib/libcrypto/arch/arm/Makefile.inc
@@ -10,8 +10,6 @@ CFLAGS+= -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
# bn
CFLAGS+= -DOPENSSL_BN_ASM_MONT
SSLASM+= bn armv4-mont
-# camellia
-SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# modes
CFLAGS+= -DGHASH_ASM
SSLASM+= modes ghash-armv4
diff --git a/lib/libcrypto/arch/hppa/Makefile.inc b/lib/libcrypto/arch/hppa/Makefile.inc
index 62887c7c860..5938320aa46 100644
--- a/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.22 2024/03/29 06:03:20 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.23 2024/03/29 07:24:09 jsing Exp $
# hppa-specific libcrypto build rules
@@ -8,8 +8,6 @@ SSLASM+= aes aes-parisc aes-parisc
# bn
SSLASM+= bn parisc-mont parisc-mont
CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W
-# camellia
-SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# modes
CFLAGS+= -DGHASH_ASM
SSLASM+= modes ghash-parisc ghash-parisc
diff --git a/lib/libcrypto/arch/i386/Makefile.inc b/lib/libcrypto/arch/i386/Makefile.inc
index 2a754a5e8fb..71bee6e1a0a 100644
--- a/lib/libcrypto/arch/i386/Makefile.inc
+++ b/lib/libcrypto/arch/i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.22 2024/03/29 07:06:21 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.23 2024/03/29 07:24:09 jsing Exp $
# i386-specific libcrypto build rules
@@ -20,10 +20,6 @@ SSLASM+= bn bn-586
SSLASM+= bn co-586
CFLAGS+= -DOPENSSL_BN_ASM_MONT
SSLASM+= bn x86-mont
-# camellia
-SRCS+= camellia.c
-SRCS+= cmll_cbc.c
-SRCS+= cmll_misc.c
# md5
CFLAGS+= -DMD5_ASM
SSLASM+= md5 md5-586
diff --git a/lib/libcrypto/arch/mips64/Makefile.inc b/lib/libcrypto/arch/mips64/Makefile.inc
index bfead1757e1..baad8c43e7b 100644
--- a/lib/libcrypto/arch/mips64/Makefile.inc
+++ b/lib/libcrypto/arch/mips64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.15 2024/03/29 06:03:21 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2024/03/29 07:24:09 jsing Exp $
# mips64-specific libcrypto build rules
@@ -11,8 +11,6 @@ CFLAGS+= -DHAVE_AES_SET_DECRYPT_KEY_INTERNAL
SSLASM+= bn mips bn-mips
SSLASM+= bn mips-mont mips-mont
CFLAGS+= -DOPENSSL_BN_ASM_MONT
-# camellia
-SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# sha
SSLASM+= sha sha1-mips sha1-mips
CFLAGS+= -DSHA1_ASM
diff --git a/lib/libcrypto/arch/powerpc/Makefile.inc b/lib/libcrypto/arch/powerpc/Makefile.inc
index 965a22c50cb..0d40e5ac3c0 100644
--- a/lib/libcrypto/arch/powerpc/Makefile.inc
+++ b/lib/libcrypto/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.11 2024/03/29 06:03:21 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.12 2024/03/29 07:24:09 jsing Exp $
# powerpc-specific libcrypto build rules
@@ -10,8 +10,6 @@ SSLASM+= bn ppc bn-ppc
SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int
#SSLASM+= bn ppc64-mont ppc64-mont # bn_mul_mont_fpu64
CFLAGS+= -DOPENSSL_BN_ASM_MONT
-# camellia
-SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# sha
CFLAGS+= -DSHA1_ASM
SSLASM+= sha sha1-ppc sha1-ppc
diff --git a/lib/libcrypto/arch/powerpc64/Makefile.inc b/lib/libcrypto/arch/powerpc64/Makefile.inc
index d1eea07681a..07c9de3d092 100644
--- a/lib/libcrypto/arch/powerpc64/Makefile.inc
+++ b/lib/libcrypto/arch/powerpc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.13 2024/03/29 06:03:21 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.14 2024/03/29 07:24:09 jsing Exp $
# powerpc-specific libcrypto build rules
@@ -10,8 +10,6 @@
#SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int
#SSLASM+= bn ppc64-mont ppc64-mont # bn_mul_mont_fpu64
#CFLAGS+= -DOPENSSL_BN_ASM_MONT
-# camellia
-SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# sha
#CFLAGS+= -DSHA1_ASM
#SSLASM+= sha sha1-ppc sha1-ppc
diff --git a/lib/libcrypto/arch/riscv64/Makefile.inc b/lib/libcrypto/arch/riscv64/Makefile.inc
index aecc312e2dc..94cc03ed70c 100644
--- a/lib/libcrypto/arch/riscv64/Makefile.inc
+++ b/lib/libcrypto/arch/riscv64/Makefile.inc
@@ -1,8 +1,3 @@
-# $OpenBSD: Makefile.inc,v 1.9 2024/03/29 06:03:21 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.10 2024/03/29 07:24:09 jsing Exp $
# riscv64 libcrypto build rules
-
-# camellia
-SRCS+= camellia.c
-SRCS+= cmll_cbc.c
-SRCS+= cmll_misc.c
diff --git a/lib/libcrypto/arch/sparc64/Makefile.inc b/lib/libcrypto/arch/sparc64/Makefile.inc
index bf481374138..3f2b7a6c553 100644
--- a/lib/libcrypto/arch/sparc64/Makefile.inc
+++ b/lib/libcrypto/arch/sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.16 2024/03/29 06:03:21 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.17 2024/03/29 07:24:09 jsing Exp $
# sparc64-specific libcrypto build rules
@@ -6,8 +6,6 @@
CFLAGS+= -DAES_ASM
SSLASM+= aes aes-sparcv9 aes-sparcv9
# bn
-# camellia
-SRCS+= camellia.c cmll_cbc.c cmll_misc.c
# modes
CFLAGS+= -DGHASH_ASM
SSLASM+= modes ghash-sparcv9 ghash-sparcv9
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 05:53:38 +0000