The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=42876a039e2b4b70918aba51a5d96d67219a5295
commit 42876a039e2b4b70918aba51a5d96d67219a5295 Author: John Baldwin <[email protected]> AuthorDate: 2022-01-18 22:48:40 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-01-18 22:48:40 +0000 crypto: Stop compiling in chacha20poly1305 AEAD ciphers from libsodium. These ciphers are now supported via OCF or 'struct enc_xform'. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33889 --- sys/conf/files | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 675cf0a6a2a2..4007d4f16c79 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4948,12 +4948,6 @@ opencrypto/xform_chacha20_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" 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_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \ - optional crypto \ - compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" -contrib/libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c \ - optional crypto \ - compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" contrib/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium"
