git: bbe969eb91eb - stable/13 - crypto.ko: Add hchacha20 from libsodium.

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Wed, 13 Jul 2022 19:43:23 UTC
The branch stable/13 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=bbe969eb91eb8bbb04c2e447b1e11ddcb7438536

commit bbe969eb91eb8bbb04c2e447b1e11ddcb7438536
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-01-11 22:15:51 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-07-13 19:21:48 +0000

    crypto.ko: Add hchacha20 from libsodium.
    
    This was added to 'device crypto' in the kernel in
    bbb7a2c7c329494e0148026f8568c0da4d8db085 but was missing from the
    module.
    
    Reviewed by:    markj
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D33522
    
    (cherry picked from commit 7df4c50643cfeecdd42b8e55c38709bf84b1b002)
---
 sys/modules/crypto/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index 4bea88b2af28..4b14cd784ebe 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -13,6 +13,7 @@ LIBSODIUM=${SRCTOP}/sys/contrib/libsodium/src/libsodium
 .PATH:	${SRCTOP}/sys/crypto/blake2
 .PATH:	${SRCTOP}/sys/crypto/chacha20
 .PATH:	${SRCTOP}/sys/contrib/libb2
+.PATH:	${LIBSODIUM}/crypto_core/hchacha20
 .PATH:	${LIBSODIUM}/crypto_onetimeauth/poly1305
 .PATH:	${LIBSODIUM}/crypto_onetimeauth/poly1305/donna
 .PATH:	${LIBSODIUM}/crypto_stream/chacha20
@@ -61,6 +62,8 @@ SRCS	+= xform_chacha20_poly1305.c
 CFLAGS.xform_chacha20_poly1305.c+= -I${LIBSODIUM_INC} -I${LIBSODIUM_COMPAT}
 SRCS	+= xform_poly1305.c
 CFLAGS.xform_poly1305.c		+= -I${LIBSODIUM_INC} -I${LIBSODIUM_COMPAT}
+SRCS	+= core_hchacha20.c
+CFLAGS.core_hchacha20.c		+= -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT}
 SRCS	+= onetimeauth_poly1305.c
 CFLAGS.onetimeauth_poly1305.c	+= -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT}
 SRCS	+= poly1305_donna.c