From nobody Sat Nov 30 16:51:08 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 4Y0wzd0wz4z5fJ4l; Sat, 30 Nov 2024 16:51:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y0wzc4pcwz4nH0; Sat, 30 Nov 2024 16:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732985468; 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=i/wjepCmKvBDmz08vOhfa043y7Z62cHSWB+ed07LTZQ=; b=Uf2GWPlSRzdBT0lSlBalpypXS3kUHBAVtS2E8esWLBkDPbxxaZg/okMM+NJtfcFSSUtcLY XnmA46qQVuZdJHmMZiI9wLlMNaBhSl9pxtkHANoHbyui3eVbo9ueAWRAePoEjsmBPnx4qS npeCNh2pjxan65MVvRoSKisSDOfELVdwnM3rjUwST1sFXlMjsg/xiLOXAIvhlghtE3IkbP 0DWojKJlBxtOnCnopDNMY/3S+dojkWikgRF/zBuYXm4JXehgzNEPsy1VTnPvQ5ZeGpaTV8 cL3QwkUZb4eWWHIQiyqrEnWpx0jejbDViOGewNG3zexT+q0sINrwGr851a3HQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732985468; 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=i/wjepCmKvBDmz08vOhfa043y7Z62cHSWB+ed07LTZQ=; b=CtCHKaNRZ5d+ShS+WfLG7Lr8fAMNfpww99S09M44P6kMiS0CJ5X560piDMG+6gqrCzRL0N 7KaMxTzFJm5S6ZPkbqwvaPy8wPPHuLqanu78qWrlVtq8tKnplLGEoSsyAieLHiTbzdOu4v ruBmh86Hqja9CdsCDDZ7/WkSdqCeh08eM1vrQtlj7rjHXTojsc8BJYyE1wchuj/cKzr043 Ii4uPsGJ6HoRLRjlA2895CWnXUYZ8/sUPj43FDswh8968ZSHfqTXl+UOxeRApHh+eG/iex yFyyt7+4A3//iqPp7COrsULjoty9u0VnVSkADcOUynm1UNkyTxKExHB2IJdK7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732985468; a=rsa-sha256; cv=none; b=uIG7/q/kh+3INURWzIbOvpDpvSTVCINdBBwLx2aJhQl62EUC9IwgclLZukMK0bwZtxItXw HDBk+5ll7NEtd3rLYdPvqauxabKKEKhWu1Gtztq6lQjCs2sDTD2FZbEWnDNTojJVzN0qMi xfkV/PB/VHRSs+UpN2/q5qtM2/d3rWGWHFmhHQCTJDYNtxT95Gu1wdhiHv1yV7df5VDuQC Q/GB7crEdnXER/NmllVf5sDwLVvx00FJ8teQwYXkBV2OHqVEEgVM8HvaK+ssC796OV97lw j72IKBQgD61G9fEEZ01kLWfCffn79lLs2N+5iOMYsmvguFfGdgMBokYKocVZRg== 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 4Y0wzc4R54zGTD; Sat, 30 Nov 2024 16:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AUGp8dJ043345; Sat, 30 Nov 2024 16:51:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AUGp8LK043342; Sat, 30 Nov 2024 16:51:08 GMT (envelope-from git) Date: Sat, 30 Nov 2024 16:51:08 GMT Message-Id: <202411301651.4AUGp8LK043342@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: 5b0997fb617e - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 5b0997fb617e3af27fb03c6bc5915d9d87fc74e5 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5b0997fb617e3af27fb03c6bc5915d9d87fc74e5 commit 5b0997fb617e3af27fb03c6bc5915d9d87fc74e5 Author: John Baldwin AuthorDate: 2024-05-21 16:42:12 +0000 Commit: John Baldwin CommitDate: 2024-11-30 13:55:57 +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 (cherry picked from commit 4ebf794a08de04ebf1c520f07bff3f8fdf48819a) --- 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 }, };