svn commit: r310474 - projects/ipsec/sys/conf

[Andrey V. Elsukov]

Author: ae
Date: Fri Dec 23 11:45:33 2016
New Revision: 310474
URL: https://svnweb.freebsd.org/changeset/base/310474

Log:
  Unconditionally build crypto(4) when IPSEC_SUPPORT is enabled.

Modified:
  projects/ipsec/sys/conf/files

Modified: projects/ipsec/sys/conf/files
==============================================================================
--- projects/ipsec/sys/conf/files	Fri Dec 23 11:26:28 2016	(r310473)
+++ projects/ipsec/sys/conf/files	Fri Dec 23 11:45:33 2016	(r310474)
@@ -587,22 +587,24 @@ contrib/ngatm/netnatm/sig/sig_unimsgcpy.
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
 contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \
 	compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-crypto/blowfish/bf_ecb.c	optional ipsec
-crypto/blowfish/bf_skey.c	optional crypto | ipsec
-crypto/camellia/camellia.c	optional crypto | ipsec
-crypto/camellia/camellia-api.c	optional crypto | ipsec
-crypto/des/des_ecb.c		optional crypto | ipsec | netsmb
-crypto/des/des_setkey.c		optional crypto | ipsec | netsmb
+crypto/blowfish/bf_ecb.c	optional ipsec | ipsec_support
+crypto/blowfish/bf_skey.c	optional crypto | ipsec | ipsec_support
+crypto/camellia/camellia.c	optional crypto | ipsec | ipsec_support
+crypto/camellia/camellia-api.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/rc4/rc4.c		optional netgraph_mppc_encryption | kgssapi
 crypto/rijndael/rijndael-alg-fst.c optional crypto | ekcd | geom_bde | \
-					 ipsec | random !random_loadable | wlan_ccmp
+	ipsec | ipsec_support | random !random_loadable | wlan_ccmp
 crypto/rijndael/rijndael-api-fst.c optional ekcd | geom_bde | random !random_loadable
-crypto/rijndael/rijndael-api.c	optional crypto | ipsec | wlan_ccmp
+crypto/rijndael/rijndael-api.c	optional crypto | ipsec | ipsec_support | \
+	wlan_ccmp
 crypto/sha1.c			optional carp | crypto | ipsec | \
-					 netgraph_mppc_encryption | sctp
-crypto/sha2/sha256c.c		optional crypto | ekcd | geom_bde | ipsec | random !random_loadable | \
-					 sctp | zfs
-crypto/sha2/sha512c.c		optional crypto | geom_bde | ipsec | zfs
+	ipsec_support | netgraph_mppc_encryption | sctp 
+crypto/sha2/sha256c.c		optional crypto | ekcd | geom_bde | ipsec | \
+	ipsec_support | random !random_loadable | sctp | zfs
+crypto/sha2/sha512c.c		optional crypto | geom_bde | ipsec | \
+	ipsec_support | zfs
 crypto/skein/skein.c		optional crypto | zfs
 crypto/skein/skein_block.c	optional crypto | zfs
 crypto/siphash/siphash.c	optional inet | inet6
@@ -3850,8 +3852,7 @@ libkern/strtouq.c		standard
 libkern/strvalid.c		standard
 libkern/timingsafe_bcmp.c	standard
 libkern/zlib.c			optional crypto | geom_uzip | ipsec | \
-					 mxge | netgraph_deflate | \
-					 ddb_ctf | gzio
+	ipsec_support | mxge | netgraph_deflate | ddb_ctf | gzio
 net/altq/altq_cbq.c		optional altq
 net/altq/altq_cdnr.c		optional altq
 net/altq/altq_codel.c		optional altq
@@ -4522,18 +4523,18 @@ ofed/drivers/infiniband/hw/mthca/mthca_u
 	compile-with "${OFED_C}"
 
 # crypto support
-opencrypto/cast.c		optional crypto | ipsec
-opencrypto/criov.c		optional crypto | ipsec
-opencrypto/crypto.c		optional crypto | ipsec
+opencrypto/cast.c		optional crypto | ipsec | ipsec_support
+opencrypto/criov.c		optional crypto | ipsec | ipsec_support
+opencrypto/crypto.c		optional crypto | ipsec | ipsec_support
 opencrypto/cryptodev.c		optional cryptodev
-opencrypto/cryptodev_if.m	optional crypto | ipsec
-opencrypto/cryptosoft.c		optional crypto | ipsec
-opencrypto/cryptodeflate.c	optional crypto | ipsec
-opencrypto/gmac.c		optional crypto | ipsec
-opencrypto/gfmult.c		optional crypto | ipsec
-opencrypto/rmd160.c		optional crypto | ipsec
-opencrypto/skipjack.c		optional crypto | ipsec
-opencrypto/xform.c		optional crypto | ipsec
+opencrypto/cryptodev_if.m	optional crypto | ipsec | ipsec_support
+opencrypto/cryptosoft.c		optional crypto | ipsec | ipsec_support
+opencrypto/cryptodeflate.c	optional crypto | ipsec | ipsec_support
+opencrypto/gmac.c		optional crypto | ipsec | ipsec_support
+opencrypto/gfmult.c		optional crypto | ipsec | ipsec_support
+opencrypto/rmd160.c		optional crypto | ipsec | ipsec_support
+opencrypto/skipjack.c		optional crypto | ipsec | ipsec_support
+opencrypto/xform.c		optional crypto | ipsec | ipsec_support
 rpc/auth_none.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/auth_unix.c			optional krpc | nfslockd | nfscl | nfsd
 rpc/authunix_prot.c		optional krpc | nfslockd | nfscl | nfsd