From nobody Tue Nov 28 19:43:13 2023 X-Original-To: dev-commits-src-main@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 4SftD20Hwlz52SKh; Tue, 28 Nov 2023 19:43:14 +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 4SftD154L9z4W32; Tue, 28 Nov 2023 19:43:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701200593; 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=NYXHCQRKJ28GcRb1FCpseXaK2m2aEdUBJhhhlXnrRkU=; b=MACWJWhDlcKB7NorXW34XLL7TYZqy6Ms6Hp3BwHRfWFKEOX8Y98B3F8DhZqNdI0UFZHga+ 5B9awWR1fpCls9h82j3vfly3ahYwcaSBbUUtKgjRfdcWJYChcR9tyA1kLcgUdLgraHARnq Us9W9s5NNUQJThm53ovEufYsXG5NPPmI5eHnoKfPRMVM3m9fz6XBdcZDTIPAb1LObA46I6 OC+5AKwmWRncsqYdg7MHhJg+IwYOoKDP6kIBGf5QngQ/2KbCUIxHxnRGelLcOgbL7RVzps 4YjHjM1xn1goVIyUU7Z/kb+h/Lt5swROon7qXjJfi/drrVsTtNy6f5uAL8HsVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701200593; 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=NYXHCQRKJ28GcRb1FCpseXaK2m2aEdUBJhhhlXnrRkU=; b=O41mCTP2RAxUyNMmwnRd+X+VpFZVHAiv223zI9ScASRQ5h+i7VfHlKdkF2gCtj8Fu1Tdhg jGCzDNgr8Z2JHHHxx9m4WnIAEV4yPVgbMFJ7cSO4MMIv8DFcuatUy1jUqUr/UUxnhImU1J pPma8W2DMKmFsgjgJwHkjCYb+uLIjTcLlrDd6VXnNDb0KRCDJ4DtmRPTE4KiQqvS/OD7SF 9j8Gei+peXifNVkdvvK85Aco7Jt7dSlMmAvlz6niuKDp7rfCgibJYnB8N+oNOffPA7MZ3q XlVo/9o2ei4gOGDu5+Akx7SoPLlKo0GCMxFCaSNvbts2HsbqMzTu6PaPej0OKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701200593; a=rsa-sha256; cv=none; b=d/OxanlFBMDJsu0vFYsjh3VDIRgojMqts4k6f3qJn68reWYq9xhtXtXRn6WVQKdvVdJec2 h4UyzpV/fzszBW4Ru0TxdGXu/vyGr2VFjDb0jNu7WVcmgmuVEPLcXhIwChcgxoFtVFp3ek DFmv0Mxj/sX9SMX3U4t239Qny3Bbia8mcIcweoMl9m61alBhdp7/OxhetosoPcsg4I2DRb 2ePehCc6I9s39fUGPVgEwXYjM0J+QbPXdKqsbFPl/rCx+LhUtY4yTL4FGBlgthjbdqDWDd DhsfqdnEUiNiQivfEJU0WtdNE+HNgyrUUjBivo0AngcS+scHHCJo3I20MD4ofw== 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 4SftD145wBzbL8; Tue, 28 Nov 2023 19:43:13 +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 3ASJhDY6046763; Tue, 28 Nov 2023 19:43:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ASJhDXs046760; Tue, 28 Nov 2023 19:43:13 GMT (envelope-from git) Date: Tue, 28 Nov 2023 19:43:13 GMT Message-Id: <202311281943.3ASJhDXs046760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 87826c87c63b - main - ossl: Fix handling of separate AAD buffers in ossl_aes_gcm() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 87826c87c63b2995cb69e9c1a624c7e20dd70fcd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=87826c87c63b2995cb69e9c1a624c7e20dd70fcd commit 87826c87c63b2995cb69e9c1a624c7e20dd70fcd Author: Mark Johnston AuthorDate: 2023-11-28 19:35:49 +0000 Commit: Mark Johnston CommitDate: 2023-11-28 19:35:49 +0000 ossl: Fix handling of separate AAD buffers in ossl_aes_gcm() Consumers may optionally provide a reference to a separate buffer containing AAD, but ossl_aes_gcm() didn't handle this and would thus compute an incorrect digest. Fixes: 9a3444d91c70 ("ossl: Add a VAES-based AES-GCM implementation for amd64") Reviewed by: jhb MFC after: 3 days Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D42736 --- sys/crypto/openssl/ossl_aes.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/crypto/openssl/ossl_aes.c b/sys/crypto/openssl/ossl_aes.c index 130bf292e521..c0cb8ba08d35 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -198,14 +198,20 @@ ossl_aes_gcm(struct ossl_session_cipher *s, struct cryptop *crp, crypto_read_iv(crp, iv); ctx->ops->setiv(ctx, iv, csp->csp_ivlen); - crypto_cursor_init(&cc_in, &crp->crp_buf); - crypto_cursor_advance(&cc_in, crp->crp_aad_start); - for (size_t alen = crp->crp_aad_length; alen > 0; alen -= seglen) { - inseg = crypto_cursor_segment(&cc_in, &inlen); - seglen = MIN(alen, inlen); - if (ctx->ops->aad(ctx, inseg, seglen) != 0) + if (crp->crp_aad != NULL) { + if (ctx->ops->aad(ctx, crp->crp_aad, crp->crp_aad_length) != 0) return (EINVAL); - crypto_cursor_advance(&cc_in, seglen); + } else { + crypto_cursor_init(&cc_in, &crp->crp_buf); + crypto_cursor_advance(&cc_in, crp->crp_aad_start); + for (size_t alen = crp->crp_aad_length; alen > 0; + alen -= seglen) { + inseg = crypto_cursor_segment(&cc_in, &inlen); + seglen = MIN(alen, inlen); + if (ctx->ops->aad(ctx, inseg, seglen) != 0) + return (EINVAL); + crypto_cursor_advance(&cc_in, seglen); + } } crypto_cursor_init(&cc_in, &crp->crp_buf);