The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5bd565855a92eff19883143be986a8045ca13cf9
commit 5bd565855a92eff19883143be986a8045ca13cf9
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2021-01-21 00:39:04 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2021-01-21 00:40:05 +0000
Tidy some crypto-related lines in sys/conf/files.
Reviewed by: cem (earlier version)
Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D27835
---
sys/conf/files | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/sys/conf/files b/sys/conf/files
index fe017a2537b7..552c496e922a 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -4908,6 +4908,7 @@ dev/mlx5/mlx5_en/mlx5_en_port_buffer.c
optional mlx5en pci inet inet6 \
compile-with "${OFED_C}"
# crypto support
+opencrypto/cbc_mac.c optional crypto
opencrypto/criov.c optional crypto | ipsec | ipsec_support
opencrypto/crypto.c optional crypto | ipsec | ipsec_support
opencrypto/cryptodev.c optional cryptodev
@@ -4918,6 +4919,7 @@ 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/xform.c optional crypto | ipsec | ipsec_support
+opencrypto/xform_cbc_mac.c optional crypto
opencrypto/xform_poly1305.c optional crypto \
compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include
-I$S/crypto/libsodium"
contrib/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c
\
@@ -4949,9 +4951,6 @@
contrib/libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchach
optional crypto \
compile-with "${NORMAL_C}
-I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
-
-opencrypto/cbc_mac.c optional crypto
-opencrypto/xform_cbc_mac.c optional crypto
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
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
