From nobody Wed Jul 13 19:43:23 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B32711D22E29; Wed, 13 Jul 2022 19:43:23 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ljp2M4g2Yz46pj; Wed, 13 Jul 2022 19:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657741403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=agPpWG4XB6zU2JiZYMhBdvKC5ZZXdNCNj4tZb49p2+U=; b=p4+QxhH6nGpGEhEuMzL++H3B99k55zQhLmVsNWEESFGaKva73cQ9nNxQ6chDxqR29Wz8IR zmY2iD75VzIJgKD8ybOzaV1DQ3AcayBye6oqExJ/uJeYHAQxgSb5gXAuH0OWLZiqYVpqKg 6b9yko6y6QqGmYTxpXKEiiX1MoByrKQHuFUgv9GMYMXOVTAj+c1eIEwpkcBqvz1OceNDd+ 0/SuH+++fdRupAc0MYt+8Xbe4/Q2V82aJvq3mB2cbk1rhpjZEBqKFz/Ev6oPMcCv2lcvBq MCKsE9xkViIh0yaDsLXzj+jH1ufAGYaAJzi6IX4jjrjqtA+wbgN91Z4BvvvU5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ljp2M3jgCzbhW; Wed, 13 Jul 2022 19:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26DJhNYx097058; Wed, 13 Jul 2022 19:43:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DJhNZv097057; Wed, 13 Jul 2022 19:43:23 GMT (envelope-from git) Date: Wed, 13 Jul 2022 19:43:23 GMT Message-Id: <202207131943.26DJhNZv097057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bbe969eb91eb - stable/13 - crypto.ko: Add hchacha20 from libsodium. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bbe969eb91eb8bbb04c2e447b1e11ddcb7438536 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657741403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=agPpWG4XB6zU2JiZYMhBdvKC5ZZXdNCNj4tZb49p2+U=; b=b6Htx6aNsqv6QycSgDi9ynblItNM+6nUaOwhTqgysTfavfxyUpacyCwBjsnONSqZrwxsmR 5fVGoKefdvbZuQx7dERr8XKJYrxgKrG6DlR5eDCH6x4RN89Nfyp1B1lZaKuc6+GVpvVdct QJlPjQOEz4u3kWVWBY2yybRS0U1/UH/b9WVy3+SbbTPuN0Yl+e5KDwtjVy3SdXM3C6bOOm Fy9+bG9mpGuck/aJkOdiSgvRIUuZYcyMbprwfVCmfD0KjvVrA96Smnp4LmnlMGlxTVZwcv NkFEazbiz2jwR3SRDWVcwaPnYV0L9n8TQpBwKXfVhDcGFr77bSxMH3P6ESWMcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657741403; a=rsa-sha256; cv=none; b=lq3epcrGxIpNJH96fL6B/nxGq3GOZtGpsx8mXDt2JylvbVgoD4Z3MuMpQS9zGt4/Z0Jgj8 PvgEeRQUyB4z7ltAnlR07q84LRTqRZVMeUNmQ7dDLlY0z3k7ERCT+O2F211LB7jzBl7qB3 dUAflSwykK7KokxBN69I/1yObgckFLpnfJcYY58lEAUxu7ALCwGR1BW75+YwbWYuAIcFpx 1/vDWPh95k7EPxqX4gyTZGetKZ4OHEyI5RoTdONrDoPujz+cKyDRGZVPzw6mW702v3cS10 3BYRD+G2ZY9Ca+FEnbY2024H3OURPGRy1/Zp3B2N7+lDMesOoM6GZomaCd2dwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bbe969eb91eb8bbb04c2e447b1e11ddcb7438536 commit bbe969eb91eb8bbb04c2e447b1e11ddcb7438536 Author: John Baldwin AuthorDate: 2022-01-11 22:15:51 +0000 Commit: John Baldwin 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