aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2020-05-11 21:34:29 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2020-05-11 21:34:29 +0000
commit0e00c709d7f1cdaeb584d244df9534bcdd0ac527 (patch)
tree23d89d0624d4de7dca540e363018ca0c9bfdcb2e /sys/conf
parent32075647ef7fedb53479d3872960d9ae40e86491 (diff)
downloadsrc-0e00c709d7f1cdaeb584d244df9534bcdd0ac527.tar.gz
src-0e00c709d7f1cdaeb584d244df9534bcdd0ac527.zip
Remove support for DES and Triple DES from OCF.
It no longer has any in-kernel consumers via OCF. smbfs still uses single DES directly, so sys/crypto/des remains for that use case. Reviewed by: cem Relnotes: yes Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D24773
Notes
Notes: svn path=/head/; revision=360933
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files4
-rw-r--r--sys/conf/files.amd643
-rw-r--r--sys/conf/files.arm2
-rw-r--r--sys/conf/files.arm642
-rw-r--r--sys/conf/files.i3862
-rw-r--r--sys/conf/files.mips3
-rw-r--r--sys/conf/files.powerpc2
-rw-r--r--sys/conf/files.riscv2
8 files changed, 9 insertions, 11 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 03f365bcd7da..56acd0ddc4af 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -684,8 +684,8 @@ crypto/camellia/camellia.c optional crypto | ipsec | ipsec_support
crypto/camellia/camellia-api.c optional crypto | ipsec | ipsec_support
crypto/chacha20/chacha.c standard
crypto/chacha20/chacha-sw.c optional crypto | ipsec | ipsec_support
-crypto/des/des_ecb.c optional crypto | ipsec | ipsec_support | netsmb
-crypto/des/des_setkey.c optional crypto | ipsec | ipsec_support | netsmb
+crypto/des/des_ecb.c optional netsmb
+crypto/des/des_setkey.c optional netsmb
crypto/rc4/rc4.c optional netgraph_mppc_encryption | kgssapi
crypto/rijndael/rijndael-alg-fst.c optional crypto | ekcd | geom_bde | \
ipsec | ipsec_support | !random_loadable | wlan_ccmp
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 72ca22070a87..e6d91e96b423 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -136,8 +136,7 @@ amd64/pci/pci_cfgreg.c optional pci
cddl/dev/dtrace/amd64/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/amd64/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
crypto/aesni/aeskeys_amd64.S optional aesni
-crypto/des/des_enc.c optional crypto | ipsec | \
- ipsec_support | netsmb
+crypto/des/des_enc.c optional netsmb
dev/acpi_support/acpi_wmi_if.m standard
dev/agp/agp_amd64.c optional agp
dev/agp/agp_i810.c optional agp
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 5d7900121a2f..11a357364fda 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -91,7 +91,7 @@ cddl/compat/opensolaris/kern/opensolaris_atomic.c optional !armv7 !armv6 zfs | !
cddl/dev/dtrace/arm/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/arm/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/arm/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
-crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb
+crypto/des/des_enc.c optional netsmb
dev/cpufreq/cpufreq_dt.c optional cpufreq fdt
dev/dwc/if_dwc.c optional dwc
dev/dwc/if_dwc_if.m optional dwc
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 2bfa9ea8015a..3477292bda44 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -221,7 +221,7 @@ armv8_crypto_wrap.o optional armv8crypto \
compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \
no-implicit-rule \
clean "armv8_crypto_wrap.o"
-crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb
+crypto/des/des_enc.c optional netsmb
dev/acpica/acpi_bus_if.m optional acpi
dev/acpica/acpi_if.m optional acpi
dev/acpica/acpi_pci_link.c optional acpi pci
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 97946cdbb904..30dedced8813 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -76,7 +76,7 @@ compat/linux/linux_vdso.c optional compat_linux
compat/linux/linux.c optional compat_linux
compat/ndis/winx32_wrap.S optional ndisapi pci
crypto/aesni/aeskeys_i386.S optional aesni
-crypto/des/arch/i386/des_enc.S optional crypto | ipsec | ipsec_support | netsmb
+crypto/des/arch/i386/des_enc.S optional netsmb
dev/agp/agp_ali.c optional agp
dev/agp/agp_amd.c optional agp
dev/agp/agp_amd64.c optional agp
diff --git a/sys/conf/files.mips b/sys/conf/files.mips
index 150878a88032..496352c63090 100644
--- a/sys/conf/files.mips
+++ b/sys/conf/files.mips
@@ -82,8 +82,7 @@ mips/mips/sc_machdep.c optional sc
dev/uart/uart_cpu_fdt.c optional uart fdt
# crypto support -- use generic
-crypto/des/des_enc.c optional crypto | ipsec | \
- ipsec_support | netsmb
+crypto/des/des_enc.c optional netsmb
# AP common nvram interface MIPS specific, but maybe should be more generic
dev/nvram2env/nvram2env_mips.c optional nvram2env
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index 1d611fc13af4..4359279c9c73 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -14,7 +14,7 @@ cddl/compat/opensolaris/kern/opensolaris_atomic.c optional zfs powerpc | dtrac
cddl/dev/dtrace/powerpc/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/powerpc/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/powerpc/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
-crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb
+crypto/des/des_enc.c optional netsmb
dev/aacraid/aacraid_endian.c optional aacraid
dev/adb/adb_bus.c optional adb
dev/adb/adb_kbd.c optional adb
diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv
index 7659db79c741..b59141e27750 100644
--- a/sys/conf/files.riscv
+++ b/sys/conf/files.riscv
@@ -2,7 +2,7 @@
cddl/dev/dtrace/riscv/dtrace_asm.S optional dtrace compile-with "${DTRACE_S}"
cddl/dev/dtrace/riscv/dtrace_subr.c optional dtrace compile-with "${DTRACE_C}"
cddl/dev/fbt/riscv/fbt_isa.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
-crypto/des/des_enc.c optional crypto | ipsec | ipsec_support | netsmb
+crypto/des/des_enc.c optional netsmb
dev/ofw/ofw_cpu.c optional fdt
dev/ofw/ofwpci.c optional pci fdt
dev/pci/pci_host_generic.c optional pci