From nobody Tue May 21 16:49:18 2024 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 4VkL4Z6fCFz5LmVJ; Tue, 21 May 2024 16:49:18 +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 4VkL4Z5J4Lz4jl8; Tue, 21 May 2024 16:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716310158; 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=LkPpmJj1us617NHljWfbfv2Dyo1ZVGBYoC99r+MwaOw=; b=wN8nQnA+zpTiPeWSOl9btvvsDsM/25oGlRVg51RVX7M/8vtO4HqK+C3bVZM6+yROPfz+Me r3kgbi/fFuektR+fEkfI/fGvNmKPfrYCxVcu/voyrt87TSEek1p0z4PwPofBs3Z9TqXVev v3xAmMTOFzplXIcWtK8HxblCxZLGvbRHdGL8ur8y6cZw7WZZEo1kpA9hPEfRkRoI3bZSvs 9pO8CjYUA4wqR7CwuxkRxurh4SPnDjljmetDuaa55V90BYQjOG8NEOzA9rVHEJkGWiGkoX uZ69HA8Coy87X7aF9fkumv3F+DBYw5P5fiHgTtGpyN5HX0B5Zu0juMieaeT45g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716310158; a=rsa-sha256; cv=none; b=Kvi4LPc0iUEVtdB34WANRK1rfixfkF08EXAsioKseENSWnNaKKRzCT2bnKREOp7k7Fxa+4 Oc7zEpmXeQNHXwJ9CJ/WPzNmu88uRyOM0+fIGlTPeAJbSZsTps0WOICyebxRlzwpy1H5LD YorCaCcxSrmO/t8X02a8gQPbyN9W7OweL/sY+VWJtFHWNI7YFMha2Mq2iD3RBSjr0H5FV2 8DSeiUe5T093p2n6JT7P+RNRVO22uWNcVjdlW8JOJkrN6h+3dIomtNOtsgxxBFTBxvPHGo 6SWkqlzqShjGKLsvuwx9Xa2m3/aVpPs7q6X3HonTxfXBAxpQ8UTRx4aOWziHRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716310158; 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=LkPpmJj1us617NHljWfbfv2Dyo1ZVGBYoC99r+MwaOw=; b=nro0QlTA7qOcd0zlQOONs3rHAZCecEYXzSum30t8m1dTYsuL2X1Wh2Oe7c0WqyJqqK2Ysw qXsD2FfUEz7H050yo7DG1biKmbXrdGb2lScVhwo2856Nn9WuWGb1I4bRYxeBxpM0FQ4qy1 jwAyQ3jOVvtQqju0OC3zjfiUnTqZg0EdsAWGQx7ztRdfulRjZJcGOcPjWVEmImuSpa0J67 lGgROqUZIvClqGhRjopQ1NJx+HdfK8oO6zqKRWLKSexRt/cTIOmLoSt558c0zaLv5Gr3S+ +UGawKEHv2TXwV5KiGrsw8o71nb/rR073H8ppIDFpN82krb66Ow8vIWGWkvEog== 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 4VkL4Z4nvgzVB0; Tue, 21 May 2024 16:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44LGnIuA004693; Tue, 21 May 2024 16:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44LGnIYq004690; Tue, 21 May 2024 16:49:18 GMT (envelope-from git) Date: Tue, 21 May 2024 16:49:18 GMT Message-Id: <202405211649.44LGnIYq004690@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: 4ebf794a08de - main - cryptocheck: Don't test Chacha20-Poly1305 with an IV size of 8 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 4ebf794a08de04ebf1c520f07bff3f8fdf48819a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4ebf794a08de04ebf1c520f07bff3f8fdf48819a commit 4ebf794a08de04ebf1c520f07bff3f8fdf48819a Author: John Baldwin AuthorDate: 2024-05-21 16:42:12 +0000 Commit: John Baldwin CommitDate: 2024-05-21 16:48:50 +0000 cryptocheck: Don't test Chacha20-Poly1305 with an IV size of 8 OpenSSL 3.0+ doesn't support an IV size of 8 either for the Chacha20 stream cipher or the AEAD combination with Poly1305. This did work previously with OpenSSL 1.1. Reviewed by: markj Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D45280 --- tools/tools/crypto/cryptocheck.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tools/crypto/cryptocheck.c b/tools/tools/crypto/cryptocheck.c index 2db283e4f65b..ef3e225e94f6 100644 --- a/tools/tools/crypto/cryptocheck.c +++ b/tools/tools/crypto/cryptocheck.c @@ -136,7 +136,7 @@ * aes-ccm128 128-bit AES-CCM * aes-ccm192 192-bit AES-CCM * aes-ccm256 256-bit AES-CCM - * chacha20-poly1305 Chacha20 with Poly1305 per RFC 8439 + * chacha20-poly1305 Chacha20 (96 bit nonce) with Poly1305 per RFC 8439 */ #include @@ -253,7 +253,7 @@ static const struct alg { .evp_cipher = EVP_aes_256_ccm }, { .name = "chacha20-poly1305", .cipher = CRYPTO_CHACHA20_POLY1305, .type = T_AEAD, .tag_len = POLY1305_HASH_LEN, - .iv_sizes = { CHACHA20_POLY1305_IV_LEN, 8 }, + .iv_sizes = { CHACHA20_POLY1305_IV_LEN }, .evp_cipher = EVP_chacha20_poly1305 }, };