From nobody Tue Jan 11 22:38:07 2022 X-Original-To: dev-commits-src-all@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 CD685194C235; Tue, 11 Jan 2022 22:38:07 +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 4JYQZR2RN8z4m6h; Tue, 11 Jan 2022 22:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 33F8921A32; Tue, 11 Jan 2022 22:38:07 +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 20BMc7Ns075779; Tue, 11 Jan 2022 22:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BMc7ol075778; Tue, 11 Jan 2022 22:38:07 GMT (envelope-from git) Date: Tue, 11 Jan 2022 22:38:07 GMT Message-Id: <202201112238.20BMc7ol075778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7df4c50643cf - main - crypto.ko: Add hchacha20 from libsodium. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 7df4c50643cfeecdd42b8e55c38709bf84b1b002 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641940687; 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=H4luyhD1KpVIqIZ4AVcakBzgpMilx/cCLyn/kfhXfUM=; b=kYTHEwle6IUVZVJr0SFKyNCWsAxx6tfMZwXv11CO7XNHBlYkjAfTt9Mezdxv9uVuLayqzo FQlX+eVkG+zonZzEc49cbJcSD5dzZAgOyB/RDnoawrV9Co3msNqjlmFeMLNRxXOQqbrMCA K4fzxIJU0AQ/lfZpJr4+XP9y69kQ0hFcqkqMb/lFXz25v4FqCnuM5vSzP2YrEzSQIjypZ1 ZkBuHklr1MU7Fb9Bsrcp84YgDv8jqE6bwNYVDF34JW1RTiAoIiLlHNlvXjLSvOyfwxOTKF OCXiZoIZ9EiauDdtIJzbOGz8Q4NaLK3szdWqJnzKuIAUstjjpWNPCfcJEeHzQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641940687; a=rsa-sha256; cv=none; b=JS6g9RQ33r4pRVckRy21SAnrdbGTG/X/RmGpLOrIGuiEoWbEcYLSseVWpnyo1G70qPOVI2 Ep76xz3uVzbi2a89VXfEwoj75mxcH9AbKZTbaNNH6c0T9u96nD5l1i/b8yloKQGeeneZr3 R0g6YHoRoAcr3yzgsWma/i+0yIrOB52iP1P3oN9X6skw4gFLSlRzwq80fVuPMD7tz1zbIg G1jrL3K0+oRhmuBqYnWEopCmtfejfankE1U+GXuKQMQzMaXMiVgq+FUhM87edRq0cNd3SS d3pmZRIYGLeNyAnEetELLPWkGV6z9opsVJ4gxh9y+o8tM6sLlMHW1HU0JlWmNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7df4c50643cfeecdd42b8e55c38709bf84b1b002 commit 7df4c50643cfeecdd42b8e55c38709bf84b1b002 Author: John Baldwin AuthorDate: 2022-01-11 22:15:51 +0000 Commit: John Baldwin CommitDate: 2022-01-11 22:15:51 +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 --- 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