Author: mmacy Date: Sun Feb 16 00:03:09 2020 New Revision: 357986 URL: https://svnweb.freebsd.org/changeset/base/357986
Log: Add chacha20poly1305 support to crypto build This is a dependency for in-kernel wireguard. Reviewed by: cem@ MFC after: 1 week Sponsored by: Rubicon Communications, LLC (Netgate) Differential Revision: https://reviews.freebsd.org/D23689 Modified: head/sys/conf/files head/sys/contrib/libsodium/src/libsodium/include/sodium/core.h head/sys/contrib/libsodium/src/libsodium/include/sodium/export.h Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sat Feb 15 23:25:39 2020 (r357985) +++ head/sys/conf/files Sun Feb 16 00:03:09 2020 (r357986) @@ -4824,6 +4824,23 @@ crypto/libsodium/randombytes.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" crypto/libsodium/utils.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -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" +contrib/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c \ + optional crypto \ + compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" +contrib/libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.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/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" + + opencrypto/cbc_mac.c optional crypto opencrypto/xform_cbc_mac.c optional crypto rpc/auth_none.c optional krpc | nfslockd | nfscl | nfsd Modified: head/sys/contrib/libsodium/src/libsodium/include/sodium/core.h ============================================================================== --- head/sys/contrib/libsodium/src/libsodium/include/sodium/core.h Sat Feb 15 23:25:39 2020 (r357985) +++ head/sys/contrib/libsodium/src/libsodium/include/sodium/core.h Sun Feb 16 00:03:09 2020 (r357986) @@ -16,11 +16,11 @@ int sodium_init(void) SODIUM_EXPORT int sodium_set_misuse_handler(void (*handler)(void)); - +#ifndef _KERNEL SODIUM_EXPORT void sodium_misuse(void) __attribute__ ((noreturn)); - +#endif #ifdef __cplusplus } #endif Modified: head/sys/contrib/libsodium/src/libsodium/include/sodium/export.h ============================================================================== --- head/sys/contrib/libsodium/src/libsodium/include/sodium/export.h Sat Feb 15 23:25:39 2020 (r357985) +++ head/sys/contrib/libsodium/src/libsodium/include/sodium/export.h Sun Feb 16 00:03:09 2020 (r357986) @@ -54,4 +54,14 @@ #define SODIUM_MIN(A, B) ((A) < (B) ? (A) : (B)) #define SODIUM_SIZE_MAX SODIUM_MIN(UINT64_MAX, SIZE_MAX) +#ifdef _KERNEL +#include <sys/param.h> +#include <sys/libkern.h> +static inline void +sodium_misuse(void) +{ + panic("bad value passed to sodium"); +} +#endif + #endif _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]"
