From b16d349f1b784dfa7078efa304e9a4d05df7ffa3 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Sun, 12 Jun 2005 00:47:21 +0000 Subject: [PATCH] Refactor the NETSMBCRYPTO option so that it does the same on all platforms. ARM is excluded as it doesn't yet have any crypto sources. Approved by: re (dwhite) MFC after: 1 day --- sys/conf/files | 2 ++ sys/conf/files.alpha | 5 +++-- sys/conf/files.amd64 | 2 -- sys/conf/files.i386 | 2 -- sys/conf/files.ia64 | 1 + sys/conf/files.pc98 | 2 -- sys/conf/files.powerpc | 1 + sys/conf/files.sparc64 | 5 +++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 2a3e4fbe181..0ac514c41ab 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -291,8 +291,10 @@ crypto/blowfish/bf_skey.c optional crypto crypto/blowfish/bf_skey.c optional ipsec ipsec_esp crypto/des/des_ecb.c optional crypto crypto/des/des_ecb.c optional ipsec ipsec_esp +crypto/des/des_ecb.c optional netsmbcrypto crypto/des/des_setkey.c optional crypto crypto/des/des_setkey.c optional ipsec ipsec_esp +crypto/des/des_setkey.c optional netsmbcrypto crypto/rc4/rc4.c optional netgraph_mppc_encryption crypto/rijndael/rijndael-alg-fst.c optional crypto crypto/rijndael/rijndael-alg-fst.c optional geom_bde diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha index 200cb96360a..34846e3f919 100644 --- a/sys/conf/files.alpha +++ b/sys/conf/files.alpha @@ -160,10 +160,11 @@ compat/linux/linux_socket.c optional compat_linux compat/linux/linux_sysctl.c optional compat_linux compat/linux/linux_stats.c optional compat_linux compat/linux/linux_util.c optional compat_linux -crypto/blowfish/bf_enc.c optional ipsec ipsec_esp -crypto/des/des_enc.c optional ipsec ipsec_esp crypto/blowfish/bf_enc.c optional crypto +crypto/blowfish/bf_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional crypto +crypto/des/des_enc.c optional ipsec ipsec_esp +crypto/des/des_enc.c optional netsmbcrypto dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa dev/atkbdc/atkbd.c optional atkbd atkbdc diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index af01789c097..4119b278c22 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -125,11 +125,9 @@ amd64/pci/pci_bus.c optional pci amd64/pci/pci_cfgreg.c optional pci crypto/blowfish/bf_enc.c optional crypto crypto/blowfish/bf_enc.c optional ipsec ipsec_esp -crypto/des/des_ecb.c optional netsmbcrypto crypto/des/des_enc.c optional crypto crypto/des/des_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional netsmbcrypto -crypto/des/des_setkey.c optional netsmbcrypto dev/acpica/acpi_if.m standard dev/arcmsr/arcmsr.c optional arcmsr pci dev/atkbdc/atkbd.c optional atkbd atkbdc diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index d390215771d..6c61174fadb 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -127,9 +127,7 @@ bf_enc.o optional ipsec ipsec_esp \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule crypto/des/arch/i386/des_enc.S optional ipsec ipsec_esp -crypto/des/des_ecb.c optional netsmbcrypto crypto/des/arch/i386/des_enc.S optional netsmbcrypto -crypto/des/des_setkey.c optional netsmbcrypto bf_enc.o optional crypto \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64 index 48cec809c61..55f4f9c70af 100644 --- a/sys/conf/files.ia64 +++ b/sys/conf/files.ia64 @@ -46,6 +46,7 @@ crypto/blowfish/bf_enc.c optional crypto crypto/blowfish/bf_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional crypto crypto/des/des_enc.c optional ipsec ipsec_esp +crypto/des/des_enc.c optional netsmbcrypto dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa dev/atkbdc/atkbd.c optional atkbd atkbdc diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index ef74effef38..332193ec7ea 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -83,9 +83,7 @@ bf_enc.o optional ipsec ipsec_esp \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule crypto/des/arch/i386/des_enc.S optional ipsec ipsec_esp -crypto/des/des_ecb.c optional netsmbcrypto crypto/des/arch/i386/des_enc.S optional netsmbcrypto -crypto/des/des_setkey.c optional netsmbcrypto bf_enc.o optional crypto \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 5e674d4612e..704a3a278c9 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -70,6 +70,7 @@ powerpc/powerpc/db_trace.c optional ddb crypto/blowfish/bf_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional ipsec ipsec_esp +crypto/des/des_enc.c optional netsmbcrypto dev/ofw/openfirm.c standard dev/ofw/ofw_bus_if.m standard diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64 index 0baea64e4c3..47b1341e692 100644 --- a/sys/conf/files.sparc64 +++ b/sys/conf/files.sparc64 @@ -18,10 +18,11 @@ ukbdmap.h optional ukbd_dflt_keymap \ clean "ukbdmap.h" # # -crypto/blowfish/bf_enc.c optional ipsec ipsec_esp -crypto/des/des_enc.c optional ipsec ipsec_esp crypto/blowfish/bf_enc.c optional crypto +crypto/blowfish/bf_enc.c optional ipsec ipsec_esp crypto/des/des_enc.c optional crypto +crypto/des/des_enc.c optional ipsec ipsec_esp +crypto/des/des_enc.c optional netsmbcrypto dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbdc.c optional atkbdc