From owner-svn-src-head@freebsd.org Sun Feb 16 00:03:10 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5575824D95A; Sun, 16 Feb 2020 00:03:10 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48KnPp1VHnz3NZW; Sun, 16 Feb 2020 00:03:10 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1DC5E1D05C; Sun, 16 Feb 2020 00:03:10 +0000 (UTC) (envelope-from mmacy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01G039Hc060700; Sun, 16 Feb 2020 00:03:09 GMT (envelope-from mmacy@FreeBSD.org) Received: (from mmacy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01G039Yx060698; Sun, 16 Feb 2020 00:03:09 GMT (envelope-from mmacy@FreeBSD.org) Message-Id: <202002160003.01G039Yx060698@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmacy set sender to mmacy@FreeBSD.org using -f From: Matt Macy Date: Sun, 16 Feb 2020 00:03:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357986 - in head/sys: conf contrib/libsodium/src/libsodium/include/sodium X-SVN-Group: head X-SVN-Commit-Author: mmacy X-SVN-Commit-Paths: in head/sys: conf contrib/libsodium/src/libsodium/include/sodium X-SVN-Commit-Revision: 357986 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Feb 2020 00:03:10 -0000 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 +#include +static inline void +sodium_misuse(void) +{ + panic("bad value passed to sodium"); +} +#endif + #endif