From nobody Sat Feb 12 22:58:32 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 1239D19BE6C4; Sat, 12 Feb 2022 22:58:34 +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 4Jx5WF3N4wz4Rg2; Sat, 12 Feb 2022 22:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644706713; 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=RwTe2ZNX6BLDA/AupNMXdTJk3zl2UEOfVzIQtcigaBM=; b=tev2OK0bNOvOTEcktIqFXoefZCc8Vn11KABb82zGEHVuMtWDKhLGeqF67r5auOQkJ7TymF JZ+5QjWMKSVbg6iX25JW3XoudyFT6rNUtUG2qadS+bXP3DZmtXF49EG+1B3WM4Lq5e76gB h0XvxzpYjqOPvB04BZEE1ediA13JvCTl1gakLyXipphRE5qQ8nqf8M26h0sXz/fuqcpKh1 +YYuyp2TWW7mSikBuZHM4zHXe4MiN4lL2TInTl8jt6JaF7t3jFgxtRS80ccIEGEeWAXcqg /xWTg5aMuoiC9fd74BPOM+wwa4AbJNqaC19+Bs5cnDsZT6pxc3unwZLIIPXuWA== 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 1A136105A2; Sat, 12 Feb 2022 22:58:33 +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 21CMwWQY037833; Sat, 12 Feb 2022 22:58:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21CMwWbJ037832; Sat, 12 Feb 2022 22:58:32 GMT (envelope-from git) Date: Sat, 12 Feb 2022 22:58:32 GMT Message-Id: <202202122258.21CMwWbJ037832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "David E. O'Brien" Subject: git: 064aaaffaca0 - stable/12 - Embedded chacha: Distinguish via dedicated macro 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: obrien X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 064aaaffaca07951ca7bd7b4d9b6f5d38a69854b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644706713; 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=RwTe2ZNX6BLDA/AupNMXdTJk3zl2UEOfVzIQtcigaBM=; b=YtrQIMqpj4D5FlJ1a+L+1VK8mMS8x5N+d/9ra+GRv7dJ0+0mtExPpj0XYQxZ+rZSK+OEsm YeNED/YNZndayHvFGiOaRctrHQLXR9G7WuElcfEgyRMoqX/yDmKcZL1anl5qLWx/SxkLA+ V4mUUOewhzoTjOmnT+5MuaFMpS1k2gdXi7IVroq3FFXwk0l1zMLk3dEiI3+e0ISlxo+Qa0 p82//Up3CUqpmBxHDJsFcJyDudZfSA+SIHHXHTdhh0iJJ5/GPi9sUeL6j53rArQbo2BAbe TJ1UuBT5bWtNEWDwypkWbg3hGmeZnDmO07bVW+wVtS2bgGIJFW7Ts4VAgQKEuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644706713; a=rsa-sha256; cv=none; b=GRR3U9NwW29o0gnfJXwJeePbVcgGxFDklKa2aDGAe6AbQBbHvF+piWlVYe8lbxF36LFM5a EwFg3RDnIJ9oyJNweXKKExK+GtuTHzyljfRabHXKLEO3qhpuK+fuFJpU+WO/T/8zbDdSZi CkEWJIo0Ki5l0n+tE4TTdWrp0h/nRUJLcgfSDO1CQy0S78b8ddkR1vXrGwRzn/bgG04kzI QTLzsfzqFpis+DZYuZDkPM1nwMZCAI1+QaYZ+ODVcCTA4+JXuzp2of6ZEeffPiw8kUjDGJ 0VbnoSQHyeOWOoBb47T00aFbiTNDKxDl6bISOuZu/R1kRE28Zvs8EQxfOg6Stg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=064aaaffaca07951ca7bd7b4d9b6f5d38a69854b commit 064aaaffaca07951ca7bd7b4d9b6f5d38a69854b Author: Conrad Meyer AuthorDate: 2018-10-20 22:14:29 +0000 Commit: David E. O'Brien CommitDate: 2022-02-12 22:27:33 +0000 Embedded chacha: Distinguish via dedicated macro Set embedding expectations via CHACHA_EMBED macro rather than _KERNEL definition. No functional change. (cherry picked from commit 243e09430a07b393a8114c1caa3a65c0e993d645) --- lib/libc/gen/arc4random.c | 1 + sys/crypto/chacha20/chacha.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c index 3a884fa8ace4..86e16e3aa857 100644 --- a/lib/libc/gen/arc4random.c +++ b/lib/libc/gen/arc4random.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include "libc_private.h" #include "un-namespace.h" +#define CHACHA_EMBED #define KEYSTREAM_ONLY #include "chacha.c" diff --git a/sys/crypto/chacha20/chacha.h b/sys/crypto/chacha20/chacha.h index d150093c6f93..73548331cc85 100644 --- a/sys/crypto/chacha20/chacha.h +++ b/sys/crypto/chacha20/chacha.h @@ -20,10 +20,10 @@ Public domain. #define CHACHA_STATELEN (CHACHA_NONCELEN+CHACHA_CTRLEN) #define CHACHA_BLOCKLEN 64 -#ifdef _KERNEL -#define LOCAL -#else +#ifdef CHACHA_EMBED #define LOCAL static +#else +#define LOCAL #endif LOCAL void chacha_keysetup(struct chacha_ctx *x, const u_char *k, u_int kbits);