diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/Makefile | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/aarch64/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/alpha/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/amd64/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/arm/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/hppa/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/i386/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/mips64/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/powerpc/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/powerpc64/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/riscv64/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/sparc64/Makefile.inc | 4 |
12 files changed, 12 insertions, 34 deletions
diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index 8c3d05bd48..4ea8d0c2ad 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/lib/libcrypto/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.175 2024/03/19 19:27:33 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.176 2024/03/27 11:12:08 jsing Exp $ |
| 2 | 2 | ||
| 3 | LIB= crypto | 3 | LIB= crypto |
| 4 | LIBREBUILD=y | 4 | LIBREBUILD=y |
| @@ -144,6 +144,7 @@ SRCS+= x_x509a.c | |||
| 144 | # bf/ | 144 | # bf/ |
| 145 | SRCS+= bf_cfb64.c | 145 | SRCS+= bf_cfb64.c |
| 146 | SRCS+= bf_ecb.c | 146 | SRCS+= bf_ecb.c |
| 147 | SRCS+= bf_enc.c | ||
| 147 | SRCS+= bf_ofb64.c | 148 | SRCS+= bf_ofb64.c |
| 148 | SRCS+= bf_skey.c | 149 | SRCS+= bf_skey.c |
| 149 | 150 | ||
diff --git a/src/lib/libcrypto/arch/aarch64/Makefile.inc b/src/lib/libcrypto/arch/aarch64/Makefile.inc index 82a1e4c6e5..bf332428b5 100644 --- a/src/lib/libcrypto/arch/aarch64/Makefile.inc +++ b/src/lib/libcrypto/arch/aarch64/Makefile.inc | |||
| @@ -1,11 +1,9 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.5 2023/04/05 11:07:40 kettenis Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.6 2024/03/27 11:12:08 jsing Exp $ |
| 2 | 2 | ||
| 3 | # aarch64-specific libcrypto build rules | 3 | # aarch64-specific libcrypto build rules |
| 4 | 4 | ||
| 5 | # aes | 5 | # aes |
| 6 | SRCS+= aes_core.c aes_cbc.c | 6 | SRCS+= aes_core.c aes_cbc.c |
| 7 | # bf | ||
| 8 | SRCS+= bf_enc.c | ||
| 9 | # bn | 7 | # bn |
| 10 | # camellia | 8 | # camellia |
| 11 | SRCS+= camellia.c cmll_cbc.c cmll_misc.c | 9 | SRCS+= camellia.c cmll_cbc.c cmll_misc.c |
diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc index 4cdcf64e0b..20bc246d46 100644 --- a/src/lib/libcrypto/arch/alpha/Makefile.inc +++ b/src/lib/libcrypto/arch/alpha/Makefile.inc | |||
| @@ -1,11 +1,9 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.6 2023/01/31 06:17:10 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.7 2024/03/27 11:12:08 jsing Exp $ |
| 2 | 2 | ||
| 3 | # alpha-specific libcrypto build rules | 3 | # alpha-specific libcrypto build rules |
| 4 | 4 | ||
| 5 | # aes | 5 | # aes |
| 6 | SRCS+= aes_core.c aes_cbc.c | 6 | SRCS+= aes_core.c aes_cbc.c |
| 7 | # bf | ||
| 8 | SRCS+= bf_enc.c | ||
| 9 | # bn | 7 | # bn |
| 10 | SSLASM+= bn alpha-mont | 8 | SSLASM+= bn alpha-mont |
| 11 | CFLAGS+= -DOPENSSL_BN_ASM_MONT | 9 | CFLAGS+= -DOPENSSL_BN_ASM_MONT |
diff --git a/src/lib/libcrypto/arch/amd64/Makefile.inc b/src/lib/libcrypto/arch/amd64/Makefile.inc index a181d05d90..878965f566 100644 --- a/src/lib/libcrypto/arch/amd64/Makefile.inc +++ b/src/lib/libcrypto/arch/amd64/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.13 2023/04/15 18:23:54 tb Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.14 2024/03/27 11:12:08 jsing Exp $ |
| 2 | 2 | ||
| 3 | # amd64-specific libcrypto build rules | 3 | # amd64-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -14,8 +14,6 @@ CFLAGS+= -DVPAES_ASM | |||
| 14 | SSLASM+= aes vpaes-x86_64 | 14 | SSLASM+= aes vpaes-x86_64 |
| 15 | SSLASM+= aes aesni-x86_64 | 15 | SSLASM+= aes aesni-x86_64 |
| 16 | SSLASM+= aes aesni-sha1-x86_64 | 16 | SSLASM+= aes aesni-sha1-x86_64 |
| 17 | # bf | ||
| 18 | SRCS+= bf_enc.c | ||
| 19 | # bn | 17 | # bn |
| 20 | CFLAGS+= -DOPENSSL_IA32_SSE2 | 18 | CFLAGS+= -DOPENSSL_IA32_SSE2 |
| 21 | CFLAGS+= -DRSA_ASM | 19 | CFLAGS+= -DRSA_ASM |
diff --git a/src/lib/libcrypto/arch/arm/Makefile.inc b/src/lib/libcrypto/arch/arm/Makefile.inc index 6e776df34d..ae57ae0eec 100644 --- a/src/lib/libcrypto/arch/arm/Makefile.inc +++ b/src/lib/libcrypto/arch/arm/Makefile.inc | |||
| @@ -6,8 +6,6 @@ | |||
| 6 | SRCS+= aes_cbc.c | 6 | SRCS+= aes_cbc.c |
| 7 | CFLAGS+= -DAES_ASM | 7 | CFLAGS+= -DAES_ASM |
| 8 | SSLASM+= aes aes-armv4 | 8 | SSLASM+= aes aes-armv4 |
| 9 | # bf | ||
| 10 | SRCS+= bf_enc.c | ||
| 11 | # bn | 9 | # bn |
| 12 | CFLAGS+= -DOPENSSL_BN_ASM_MONT | 10 | CFLAGS+= -DOPENSSL_BN_ASM_MONT |
| 13 | SSLASM+= bn armv4-mont | 11 | SSLASM+= bn armv4-mont |
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc index c11b899440..5454a4e7ae 100644 --- a/src/lib/libcrypto/arch/hppa/Makefile.inc +++ b/src/lib/libcrypto/arch/hppa/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.14 2023/01/31 06:17:10 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.15 2024/03/27 11:12:08 jsing Exp $ |
| 2 | 2 | ||
| 3 | # hppa-specific libcrypto build rules | 3 | # hppa-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -6,8 +6,6 @@ | |||
| 6 | SRCS+= aes_core.c aes_cbc.c | 6 | SRCS+= aes_core.c aes_cbc.c |
| 7 | CFLAGS+= -DAES_ASM | 7 | CFLAGS+= -DAES_ASM |
| 8 | SSLASM+= aes aes-parisc aes-parisc | 8 | SSLASM+= aes aes-parisc aes-parisc |
| 9 | # bf | ||
| 10 | SRCS+= bf_enc.c | ||
| 11 | # bn | 9 | # bn |
| 12 | SSLASM+= bn parisc-mont parisc-mont | 10 | SSLASM+= bn parisc-mont parisc-mont |
| 13 | CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W | 11 | CFLAGS+= -DOPENSSL_BN_ASM_MONT -DBN_DIV2W |
diff --git a/src/lib/libcrypto/arch/i386/Makefile.inc b/src/lib/libcrypto/arch/i386/Makefile.inc index 6957eff868..49eab68562 100644 --- a/src/lib/libcrypto/arch/i386/Makefile.inc +++ b/src/lib/libcrypto/arch/i386/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.10 2024/03/27 10:59:48 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.11 2024/03/27 11:12:08 jsing Exp $ |
| 2 | 2 | ||
| 3 | # i386-specific libcrypto build rules | 3 | # i386-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -11,8 +11,6 @@ SSLASM+= aes aes-586 | |||
| 11 | CFLAGS+= -DVPAES_ASM | 11 | CFLAGS+= -DVPAES_ASM |
| 12 | SSLASM+= aes vpaes-x86 | 12 | SSLASM+= aes vpaes-x86 |
| 13 | SSLASM+= aes aesni-x86 | 13 | SSLASM+= aes aesni-x86 |
| 14 | # bf | ||
| 15 | SRCS+= bf_enc.c | ||
| 16 | # bn | 14 | # bn |
| 17 | CFLAGS+= -DOPENSSL_IA32_SSE2 | 15 | CFLAGS+= -DOPENSSL_IA32_SSE2 |
| 18 | SSLASM+= bn bn-586 | 16 | SSLASM+= bn bn-586 |
diff --git a/src/lib/libcrypto/arch/mips64/Makefile.inc b/src/lib/libcrypto/arch/mips64/Makefile.inc index 2d547f4a5c..403c9d3278 100644 --- a/src/lib/libcrypto/arch/mips64/Makefile.inc +++ b/src/lib/libcrypto/arch/mips64/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.7 2023/01/20 10:07:52 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.8 2024/03/27 11:12:08 jsing Exp $ |
| 2 | 2 | ||
| 3 | # mips64-specific libcrypto build rules | 3 | # mips64-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -6,8 +6,6 @@ | |||
| 6 | SRCS+= aes_cbc.c | 6 | SRCS+= aes_cbc.c |
| 7 | CFLAGS+= -DAES_ASM | 7 | CFLAGS+= -DAES_ASM |
| 8 | SSLASM+= aes aes-mips aes-mips | 8 | SSLASM+= aes aes-mips aes-mips |
| 9 | # bf | ||
| 10 | SRCS+= bf_enc.c | ||
| 11 | # bn | 9 | # bn |
| 12 | SSLASM+= bn mips bn-mips | 10 | SSLASM+= bn mips bn-mips |
| 13 | SSLASM+= bn mips-mont mips-mont | 11 | SSLASM+= bn mips-mont mips-mont |
diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc index 6c168c7989..86ea364038 100644 --- a/src/lib/libcrypto/arch/powerpc/Makefile.inc +++ b/src/lib/libcrypto/arch/powerpc/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.4 2023/01/17 15:04:27 miod Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.5 2024/03/27 11:12:08 jsing Exp $ |
| 2 | 2 | ||
| 3 | # powerpc-specific libcrypto build rules | 3 | # powerpc-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -7,8 +7,6 @@ SRCS+= aes_core.c aes_cbc.c | |||
| 7 | # slower than C code | 7 | # slower than C code |
| 8 | #CFLAGS+= -DAES_ASM | 8 | #CFLAGS+= -DAES_ASM |
| 9 | #SSLASM+= aes aes-ppc aes-ppc | 9 | #SSLASM+= aes aes-ppc aes-ppc |
| 10 | # bf | ||
| 11 | SRCS+= bf_enc.c | ||
| 12 | # bn | 10 | # bn |
| 13 | SSLASM+= bn ppc bn-ppc | 11 | SSLASM+= bn ppc bn-ppc |
| 14 | SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int | 12 | SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int |
diff --git a/src/lib/libcrypto/arch/powerpc64/Makefile.inc b/src/lib/libcrypto/arch/powerpc64/Makefile.inc index fe19069ee0..8816f0d29c 100644 --- a/src/lib/libcrypto/arch/powerpc64/Makefile.inc +++ b/src/lib/libcrypto/arch/powerpc64/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.6 2023/01/31 06:17:10 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.7 2024/03/27 11:12:08 jsing Exp $ |
| 2 | 2 | ||
| 3 | # powerpc-specific libcrypto build rules | 3 | # powerpc-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -7,8 +7,6 @@ SRCS+= aes_core.c aes_cbc.c | |||
| 7 | # slower than C code | 7 | # slower than C code |
| 8 | #CFLAGS+= -DAES_ASM | 8 | #CFLAGS+= -DAES_ASM |
| 9 | #SSLASM+= aes aes-ppc aes-ppc | 9 | #SSLASM+= aes aes-ppc aes-ppc |
| 10 | # bf | ||
| 11 | SRCS+= bf_enc.c | ||
| 12 | # bn | 10 | # bn |
| 13 | #SSLASM+= bn ppc bn-ppc | 11 | #SSLASM+= bn ppc bn-ppc |
| 14 | #SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int | 12 | #SSLASM+= bn ppc-mont ppc-mont # bn_mul_mont_int |
diff --git a/src/lib/libcrypto/arch/riscv64/Makefile.inc b/src/lib/libcrypto/arch/riscv64/Makefile.inc index 7094746b04..e0d7e1863d 100644 --- a/src/lib/libcrypto/arch/riscv64/Makefile.inc +++ b/src/lib/libcrypto/arch/riscv64/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.2 2023/08/25 02:17:41 tb Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.3 2024/03/27 11:12:08 jsing Exp $ |
| 2 | 2 | ||
| 3 | # riscv64 libcrypto build rules | 3 | # riscv64 libcrypto build rules |
| 4 | 4 | ||
| @@ -6,9 +6,6 @@ | |||
| 6 | SRCS+= aes_core.c | 6 | SRCS+= aes_core.c |
| 7 | SRCS+= aes_cbc.c | 7 | SRCS+= aes_cbc.c |
| 8 | 8 | ||
| 9 | # bf | ||
| 10 | SRCS+= bf_enc.c | ||
| 11 | |||
| 12 | # camellia | 9 | # camellia |
| 13 | SRCS+= camellia.c | 10 | SRCS+= camellia.c |
| 14 | SRCS+= cmll_cbc.c | 11 | SRCS+= cmll_cbc.c |
diff --git a/src/lib/libcrypto/arch/sparc64/Makefile.inc b/src/lib/libcrypto/arch/sparc64/Makefile.inc index 1b149ffb4e..dcc9033f50 100644 --- a/src/lib/libcrypto/arch/sparc64/Makefile.inc +++ b/src/lib/libcrypto/arch/sparc64/Makefile.inc | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile.inc,v 1.8 2023/01/31 06:17:10 jsing Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.9 2024/03/27 11:12:09 jsing Exp $ |
| 2 | 2 | ||
| 3 | # sparc64-specific libcrypto build rules | 3 | # sparc64-specific libcrypto build rules |
| 4 | 4 | ||
| @@ -6,8 +6,6 @@ | |||
| 6 | SRCS+= aes_core.c aes_cbc.c | 6 | SRCS+= aes_core.c aes_cbc.c |
| 7 | CFLAGS+= -DAES_ASM | 7 | CFLAGS+= -DAES_ASM |
| 8 | SSLASM+= aes aes-sparcv9 aes-sparcv9 | 8 | SSLASM+= aes aes-sparcv9 aes-sparcv9 |
| 9 | # bf | ||
| 10 | SRCS+= bf_enc.c | ||
| 11 | # bn | 9 | # bn |
| 12 | # camellia | 10 | # camellia |
| 13 | SRCS+= camellia.c cmll_cbc.c cmll_misc.c | 11 | SRCS+= camellia.c cmll_cbc.c cmll_misc.c |
