From nobody Sat Feb 12 22:58:30 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 06B3E19BE71E; Sat, 12 Feb 2022 22:58:31 +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 4Jx5WB6lHXz4S2S; Sat, 12 Feb 2022 22:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644706711; 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=oC3qvUDRNgZqAYLsiS3R94Fdxy+g4C6asJNFPGJJKKs=; b=g1u6wrQmCfrGD34Q51CeACRsgwCj/djip5CW9vzHaNXBCt2jXGPvHy2CveFzsTb6Mw5cSq DgAKV/om2uk0kfNqsMLOBu5FrinaGBXXsqTeVefb//D+wetCZi1TkfEh11I7am/DpZaYmH nQuCv7sNI3y27/8eD6LQWjI4oi6Cg5LWUalA4WLAGYqnmTuIKXiB/kVyyUWk8UDO8gh3MK KyPMq4CgwAOWy0rrdAlecWpioLXIAdgEMMfB4Zzi6BWQOqM+vcoAiCcu5ibNwiypVE6HHo RZmMcayZSGurNNAIOqANAPqZVtKuGQexnzcYGOekA3m8kKWgVPWaVLElAUri8g== 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 C36121072A; Sat, 12 Feb 2022 22:58:30 +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 21CMwUu1037784; Sat, 12 Feb 2022 22:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21CMwUeR037783; Sat, 12 Feb 2022 22:58:30 GMT (envelope-from git) Date: Sat, 12 Feb 2022 22:58:30 GMT Message-Id: <202202122258.21CMwUeR037783@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: 759aae422e0b - stable/12 - crypto/chacha: Split header into separate _chacha.h 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: 759aae422e0b47967c6dd00d540ab4a2bb2c3b0d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644706711; 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=oC3qvUDRNgZqAYLsiS3R94Fdxy+g4C6asJNFPGJJKKs=; b=BAiCr7uTPcDhMNiN65g+q9PcQl57VOCKIEb3j/5jeb7GVxJjoZOiaOFxCuJk5aCX6MrTZC GiEA+8TBt/V/IKyRhDxuyZ7S7vJEdCrXChCo3wAurE0zm+h6aF47d87dmjONOtY8VeITw7 xICRHJkVFxq8Bclft/c0TSU5rEmYSaoLuaq/3tQkbyDKLM81QDOkQB4NWqp9i9xv73mQq7 IU668SqkmY4i/YrZQD0mLCaWQidN/FMlW6tmur39wmPO4g4jw8tIgu5lGMAgkNQHckE/Zn YWOxs43Kn1om8siqNO0FZ1NPKafUkrmaiImIB+ySS2tPfC8ewedGZyyKyuvWKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644706711; a=rsa-sha256; cv=none; b=SjFqbL2nqt0rezOOmrf8VSzbwgJnLMgI8kPgIzPgQAKNrJpwgeWMBzCDUmBxoZ71jpwvy5 31iGwExaGcU/zFVyxwgBeKK1nsmIEWl6jLO2a9FUN8nUjalNaFBX0PefCzSHpe4KzBcqH4 SPT4JFqIaaasUNr15gtI2mHVTXJDh3JhVbmpaGXt+vgEVGPZIeRbgz382a5putzIkQztou RSBywFLcvoSHBFj331dT1eW21AVpPSz7XHLoYk6qu/TOnyF1sCEH0uLF7T1MDCbCUDXdd2 enfuvUslFPwqQVp5Ln/F0jckMdxPaJyskq5hff6+cjfA2/Q8qd5EXtptbU5aEw== 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=759aae422e0b47967c6dd00d540ab4a2bb2c3b0d commit 759aae422e0b47967c6dd00d540ab4a2bb2c3b0d Author: Conrad Meyer AuthorDate: 2018-10-20 22:12:53 +0000 Commit: David E. O'Brien CommitDate: 2022-02-12 21:53:34 +0000 crypto/chacha: Split header into separate _chacha.h (cherry picked from commit addfc6364f29525ae66d25bfe5f957b366ff63e8) --- sys/crypto/chacha20/_chacha.h | 12 ++++++++++++ sys/crypto/chacha20/chacha.h | 5 +---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys/crypto/chacha20/_chacha.h b/sys/crypto/chacha20/_chacha.h new file mode 100644 index 000000000000..a7217b628d0e --- /dev/null +++ b/sys/crypto/chacha20/_chacha.h @@ -0,0 +1,12 @@ +/* $FreeBSD$ */ + +#ifndef _CHACHA_H +#define _CHACHA_H + +#include + +struct chacha_ctx { + u_int input[16]; +}; + +#endif diff --git a/sys/crypto/chacha20/chacha.h b/sys/crypto/chacha20/chacha.h index e67cc81264cd..d150093c6f93 100644 --- a/sys/crypto/chacha20/chacha.h +++ b/sys/crypto/chacha20/chacha.h @@ -12,10 +12,7 @@ Public domain. #define CHACHA_H #include - -struct chacha_ctx { - u_int input[16]; -}; +#include #define CHACHA_MINKEYLEN 16 #define CHACHA_NONCELEN 8