From nobody Tue Jan 11 22:38:15 2022 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 8BDF5194C41F; Tue, 11 Jan 2022 22:38:16 +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 4JYQZb2nCyz4mB8; Tue, 11 Jan 2022 22:38:15 +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 2CE2721C19; Tue, 11 Jan 2022 22:38:15 +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 20BMcFqA075960; Tue, 11 Jan 2022 22:38:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BMcFfB075959; Tue, 11 Jan 2022 22:38:15 GMT (envelope-from git) Date: Tue, 11 Jan 2022 22:38:15 GMT Message-Id: <202201112238.20BMcFfB075959@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: f8580fcaa1e1 - main - cryptosoft: Use multi-block encrypt/decrypt for AES-CCM. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f8580fcaa1e1f6ca0896264437285b13d236f321 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641940695; 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=6cB1nRSaXjXQKNAXMTfLVjCq1Jb7SCSDa9v4NBKOapY=; b=y3AWPjAf6Xa56JUG9Au3eEIBencOek5u5Fy4RnIjDUMDO3Qp23jzPMxKabgIsON+xLvlsx tdD5lJ9UG4fQwSuiYbeTAHPuZSGChbW9vbj+EOjnVefGPm/NPcEO5LY0+UGfDELJsaqZBW m3TLSL24xW0QB0cZBBhGpI1za9LQiWLyAu1znomDGkQjCttWhfLt5jKcA+JaQI73ucj/xp 6ErQ50654EAXfYzcYZkBHIWblZMgnHtGx3YcpmYg/avBJQkhgCIL4qYvsgxrcLHp1g4i89 38BAfSw7mr3AYM9IRyNjP9Svq0tPeG3DPbdookiXzpPdCee0+u+kUokhXHRABA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641940695; a=rsa-sha256; cv=none; b=bs7k3ce0Pn4+QIeVu7Mlufg61bqmIqPuHFZSSYixUdEehCIYD7Q6pznBQEINa9viA+Q4OR q3W8ZZZ/e3oyEF/300UuuNhxOLWKAFcvoM1A29xU2zTbtYjWA/vdK074OZgfWQoU1fxLdl TV+lSPrcOsngeXG845DUECcryy0XUrcPQUvbXWC7LQEIssxtCQFn5srKBeTKL2075E5rax LV7CcfWoXdUF/4hvZLK6Bpt2etxFz1ex5FM9UbbWajik8LuVU+LRjGAJxuTyP54IpiDHwD WvYN3GV5xZ2iew5gR9jur107tG+6yMJLUu8kcY989IyNVOmK47Hq7cNolCGrTQ== 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=f8580fcaa1e1f6ca0896264437285b13d236f321 commit f8580fcaa1e1f6ca0896264437285b13d236f321 Author: John Baldwin AuthorDate: 2022-01-11 22:21:00 +0000 Commit: John Baldwin CommitDate: 2022-01-11 22:21:00 +0000 cryptosoft: Use multi-block encrypt/decrypt for AES-CCM. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33757 --- sys/opencrypto/cryptosoft.c | 104 +++++++++++++++++++++++++++++++++----------- 1 file changed, 79 insertions(+), 25 deletions(-) diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c index 36081589cc65..93b2c76cde4e 100644 --- a/sys/opencrypto/cryptosoft.c +++ b/sys/opencrypto/cryptosoft.c @@ -748,6 +748,7 @@ swcr_ccm(const struct swcr_session *ses, struct cryptop *crp) struct crypto_buffer_cursor cc_in, cc_out; const u_char *inblk; u_char *outblk; + size_t inlen, outlen, todo; const struct swcr_auth *swa; const struct swcr_encdec *swe; const struct enc_xform *exf; @@ -808,28 +809,44 @@ swcr_ccm(const struct swcr_session *ses, struct cryptop *crp) /* Do encryption/decryption with MAC */ crypto_cursor_init(&cc_in, &crp->crp_buf); crypto_cursor_advance(&cc_in, crp->crp_payload_start); + inblk = crypto_cursor_segment(&cc_in, &inlen); if (CRYPTO_HAS_OUTPUT_BUFFER(crp)) { crypto_cursor_init(&cc_out, &crp->crp_obuf); crypto_cursor_advance(&cc_out, crp->crp_payload_output_start); } else cc_out = cc_in; - for (resid = crp->crp_payload_length; resid >= blksz; resid -= blksz) { - inblk = crypto_cursor_segment(&cc_in, &len); - if (len < blksz) { + outblk = crypto_cursor_segment(&cc_out, &outlen); + + for (resid = crp->crp_payload_length; resid >= blksz; resid -= todo) { + if (inlen < blksz) { crypto_cursor_copydata(&cc_in, blksz, blk); inblk = blk; - } else - crypto_cursor_advance(&cc_in, blksz); + inlen = blksz; + } + if (CRYPTO_OP_IS_ENCRYPT(crp->crp_op)) { - outblk = crypto_cursor_segment(&cc_out, &len); - if (len < blksz) + if (outlen < blksz) { outblk = blk; - exf->update(ctx, inblk, blksz); - exf->encrypt(ctx, inblk, outblk); - if (outblk == blk) + outlen = blksz; + } + + todo = rounddown2(MIN(resid, MIN(inlen, outlen)), + blksz); + + exf->update(ctx, inblk, todo); + exf->encrypt_multi(ctx, inblk, outblk, todo); + + if (outblk == blk) { crypto_cursor_copyback(&cc_out, blksz, blk); - else - crypto_cursor_advance(&cc_out, blksz); + outblk = crypto_cursor_segment(&cc_out, &outlen); + } else { + crypto_cursor_advance(&cc_out, todo); + outlen -= todo; + outblk += todo; + if (outlen == 0) + outblk = crypto_cursor_segment(&cc_out, + &outlen); + } } else { /* * One of the problems with CCM+CBC is that @@ -839,8 +856,19 @@ swcr_ccm(const struct swcr_session *ses, struct cryptop *crp) * the tag and a second time after the tag is * verified. */ + todo = blksz; exf->decrypt(ctx, inblk, blk); - exf->update(ctx, blk, blksz); + exf->update(ctx, blk, todo); + } + + if (inblk == blk) { + inblk = crypto_cursor_segment(&cc_in, &inlen); + } else { + crypto_cursor_advance(&cc_in, todo); + inlen -= todo; + inblk += todo; + if (inlen == 0) + inblk = crypto_cursor_segment(&cc_in, &inlen); } } if (resid > 0) { @@ -873,22 +901,48 @@ swcr_ccm(const struct swcr_session *ses, struct cryptop *crp) exf->reinit(ctx, crp->crp_iv, ivlen); crypto_cursor_init(&cc_in, &crp->crp_buf); crypto_cursor_advance(&cc_in, crp->crp_payload_start); - for (resid = crp->crp_payload_length; resid > blksz; - resid -= blksz) { - inblk = crypto_cursor_segment(&cc_in, &len); - if (len < blksz) { + inblk = crypto_cursor_segment(&cc_in, &inlen); + + for (resid = crp->crp_payload_length; resid >= blksz; + resid -= todo) { + if (inlen < blksz) { crypto_cursor_copydata(&cc_in, blksz, blk); inblk = blk; - } else - crypto_cursor_advance(&cc_in, blksz); - outblk = crypto_cursor_segment(&cc_out, &len); - if (len < blksz) + inlen = blksz; + } + if (outlen < blksz) { outblk = blk; - exf->decrypt(ctx, inblk, outblk); - if (outblk == blk) + outlen = blksz; + } + + todo = rounddown2(MIN(resid, MIN(inlen, outlen)), + blksz); + + exf->decrypt_multi(ctx, inblk, outblk, todo); + + if (inblk == blk) { + inblk = crypto_cursor_segment(&cc_in, &inlen); + } else { + crypto_cursor_advance(&cc_in, todo); + inlen -= todo; + inblk += todo; + if (inlen == 0) + inblk = crypto_cursor_segment(&cc_in, + &inlen); + } + + if (outblk == blk) { crypto_cursor_copyback(&cc_out, blksz, blk); - else - crypto_cursor_advance(&cc_out, blksz); + outblk = crypto_cursor_segment(&cc_out, + &outlen); + } else { + crypto_cursor_advance(&cc_out, todo); + outlen -= todo; + outblk += todo; + if (outlen == 0) + outblk = crypto_cursor_segment(&cc_out, + &outlen); + } } if (resid > 0) { crypto_cursor_copydata(&cc_in, resid, blk);