From nobody Fri Dec 01 14:36:38 2023 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 4ShbGv0t2Hz52h1H; Fri, 1 Dec 2023 14:36:39 +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 4ShbGv0R0zz3Kyj; Fri, 1 Dec 2023 14:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701441399; 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=rt0KLxrlZT1w3qWB2I1StmW+Dpppcizwb93S57Lv6/4=; b=U+hJR31gezhuWdDu6hO4JdrLnVEkQvBGeheUxPMSEd4nj4JAZJm4CrrzS9h/0PJ2kavZhd Bl8RzEL9npadv8bXrZ8AkiSCcaHNfjTkGJJEtW1nDJGVQ1hUeKoOOx6F4u4oUD9v8Buj7X z08fNICcP06+7TPbOdtq45cueEBUerk1sFVpPpR1OCVInu/qNMguzhXAhxckV1pvVdTiwE Pgaie06SnEFNN/r5EXIWcBbouasXPsmKXrZ8Hr7IqSTYcjbGHOAuQo5OQSDz6+hme2E8KF Np5mnvgpJtRymvVpGOJ/n0EkKQGiYdWAW+Io4lJj5BZBfJ56p1psOtpsWxEVHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701441399; 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=rt0KLxrlZT1w3qWB2I1StmW+Dpppcizwb93S57Lv6/4=; b=vH9SwQ5jyP7siOHotNgz3yl3A5+qsmAQljDuaO0mVOpSjM4MLGYzXYtdCMpDLnJPypyHdl LST8QfLxjN1TSO0QFEwv/2xQG3bU/dIzgI6OCXa8nnPTGyMrZ3mCBXJRxzEzRWFeAwwCmH MZNd5uUry1CIaLGBBj+BI88f7BRdxejyVPuu75ZYXIhYeqjfNHuSpoLBiCZkZ12QDgMBxN HfB1O7ycinD1lzZ0277kF/BQoAnazIkswLcPFl/CqjBTSxZC/tk5lxu2oPNJu9qXdVZcLe 3uv6ZceKS/t1o4RWqss2+elJSWsMJXJoy0OAi6j/FhQ1Af7fjLCgjmAWo/kOtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701441399; a=rsa-sha256; cv=none; b=nPxBvovd8pgrtWHFzx5WvAkuTxmePNZHQl59876/v6IDPmUHuaWNy0LPUS6ZGBabX9yosD g+q7H4PU2P0FjlQschySknj9vh5YaFmIKMzYN2C/v7mfE45RwicOfCvHvF6EINbuqrGeP8 KFywX2CT6vDvnC0L6pifQOMMeP8Y+Rf23Zgj5Kvqrd1KBQ1mE58GfTVVLNtKVhslMrmvlK dDIslNoN7FncLNvbSwxuKkNq4EIB4hZjPlSCPk2iUZrXMase76A3Mn2xF+Yp0YWk0wcFFJ /IVa08ast2r7hUX0hYE3RtuOYIgxHVbKacf9UdLCxit/IgmNRvVwvFSgTI1SXg== 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 4ShbGt6c50zd1w; Fri, 1 Dec 2023 14:36:38 +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 3B1Eac5Y061422; Fri, 1 Dec 2023 14:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1Eac5U061419; Fri, 1 Dec 2023 14:36:38 GMT (envelope-from git) Date: Fri, 1 Dec 2023 14:36:38 GMT Message-Id: <202312011436.3B1Eac5U061419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 24cd42aeb623 - stable/14 - ossl: Fix handling of separate AAD buffers in ossl_aes_gcm() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 24cd42aeb6232b4678f45dc6d242e8982dbea8e6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=24cd42aeb6232b4678f45dc6d242e8982dbea8e6 commit 24cd42aeb6232b4678f45dc6d242e8982dbea8e6 Author: Mark Johnston AuthorDate: 2023-11-28 19:35:49 +0000 Commit: Mark Johnston CommitDate: 2023-12-01 14:36:27 +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 (cherry picked from commit 87826c87c63b2995cb69e9c1a624c7e20dd70fcd) --- 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 84d694a7199f..40162b6943df 100644 --- a/sys/crypto/openssl/ossl_aes.c +++ b/sys/crypto/openssl/ossl_aes.c @@ -199,14 +199,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);