From nobody Fri Dec 17 22:00:07 2021 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 D464718F5C84; Fri, 17 Dec 2021 22:00:07 +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 4JG2w74Dwpz3sw1; Fri, 17 Dec 2021 22:00:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 715AE238CB; Fri, 17 Dec 2021 22:00:07 +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 1BHM07qv006001; Fri, 17 Dec 2021 22:00:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BHM07tV005999; Fri, 17 Dec 2021 22:00:07 GMT (envelope-from git) Date: Fri, 17 Dec 2021 22:00:07 GMT Message-Id: <202112172200.1BHM07tV005999@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: 49bb13076532 - main - cryptosoft: Remove unused 'iv' in swcr_ccm_cbc_mac. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49bb13076532ec9a24ea26cf0c9c4649641c8ea8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639778407; 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=KSX+qI2SRyzkWl33ZDGKtqAfgwaSkF+OqTUoailc1k8=; b=b5+D0Hcp7o2RlvrgIC8eUukrwJ2MPtvp5l1Ts/6HaTnpoDMd/bBaWbma5ww4lOVGgYDBSu vOYSjS325e14k97P4jIrHCn4Ig01mIsQ2ix5MqVoWc94kDCcqvqdBOlIdCfXlvDRBB51NX ES00CyvkUKCWB/3SMLix7fxeT5Yq6IXTC5f2ogRkueT+4M7wwNSQqQLiboMqO41cyKt32W 5VUshusZR06fO3F8k55pIypcvANwTg8jZ4jVG8g+ip121y9/CoQWr+ViRcsf+Zpa7s7GEx vegy0kzMYd88kHijerS6AxYrbR22SEImL8DEtCAPcZnyp/xKct+f3deVjTxahA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639778407; a=rsa-sha256; cv=none; b=I4rqe9yWAqB2I7424e+X3K6NL/P//WiJSH/djEsA6Vvgpkn70GXbNumAY3g/sVia0lLgJo nri16qAOf9mZpKfFs1ZU+CaBUz3lHUYXiWmQQ80l3IMD4HysHRb64DKDehkizNu/9tfCcB Lav43AfScJbj33Mo1/CY31HkjeU5zJr37EjMRSdbW5aDGDiK/imLxWSzGd9dQm1FdnTgKw ybxQhECEUSgUo+d8KiHwWiW+/1PWkNYvXXcozpzqBf93kf41y7POWWtkvBuMrebxbxV7ws Taj4V1mh1kLChbzpeXcPw31R3l5zQTFBR2QlPvilkrCyFLcVLSbe+/EHrYNPMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=49bb13076532ec9a24ea26cf0c9c4649641c8ea8 commit 49bb13076532ec9a24ea26cf0c9c4649641c8ea8 Author: John Baldwin AuthorDate: 2021-12-17 21:58:58 +0000 Commit: John Baldwin CommitDate: 2021-12-17 21:58:58 +0000 cryptosoft: Remove unused 'iv' in swcr_ccm_cbc_mac. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33525 --- sys/opencrypto/cryptosoft.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c index 62dae55f1537..6f03902498b1 100644 --- a/sys/opencrypto/cryptosoft.c +++ b/sys/opencrypto/cryptosoft.c @@ -624,7 +624,6 @@ build_ccm_aad_length(u_int aad_length, uint8_t *blk) static int swcr_ccm_cbc_mac(const struct swcr_session *ses, struct cryptop *crp) { - u_char iv[AES_BLOCK_LEN]; u_char blk[CCM_CBC_BLOCK_LEN]; u_char tag[AES_CBC_MAC_HASH_LEN]; union authctx ctx; @@ -645,7 +644,6 @@ swcr_ccm_cbc_mac(const struct swcr_session *ses, struct cryptop *crp) /* Initialize the IV */ ivlen = csp->csp_ivlen; - crypto_read_iv(crp, iv); /* Supply MAC with IV */ axf->Reinit(&ctx, crp->crp_iv, ivlen); @@ -679,7 +677,6 @@ swcr_ccm_cbc_mac(const struct swcr_session *ses, struct cryptop *crp) } explicit_bzero(tag, sizeof(tag)); explicit_bzero(blk, sizeof(blk)); - explicit_bzero(iv, sizeof(iv)); return (error); }