From nobody Tue Jan 11 22:38:12 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 186D5194C25F; Tue, 11 Jan 2022 22:38: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 4JYQZY2jPWz4mB4; Tue, 11 Jan 2022 22:38:13 +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 DE974217CD; Tue, 11 Jan 2022 22:38:12 +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 20BMcCQY075906; Tue, 11 Jan 2022 22:38:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BMcCM1075905; Tue, 11 Jan 2022 22:38:12 GMT (envelope-from git) Date: Tue, 11 Jan 2022 22:38:12 GMT Message-Id: <202201112238.20BMcCM1075905@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: 69e533c3ffcf - main - swcr_encdec: Rename blks to blksz. 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: 69e533c3ffcf272da76e6192bff0ecc10fa182ff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641940693; 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=0MnBL/9bNn9uka+UuFdiox0Q+MuFUmZgYbXhUbuLF8g=; b=siJ3/Bv7hzYtVwyx51cg9rk8XZXa/IQ7vFDuEKsudMz3NCzveyQFYlN/AKf9r5HKez0QZj actj5xsKKXhnlD79JxBqr0FNR1mTZb+J/a+ylARgwwb1VzELfaL5AuyhfiEMIFoArGitgG K/rBX31flP51uP0lWTiimeJHxZXSeReXlkiCHm6p9QlddysmekLIiJwbgleQOm01M3UXt2 87hh8pGMnX8TFRRn52pXsk6hnDLkIoUE4Zkl7SzJw9P8TmfEKmTRHvpFPAu0mKuvflDMVQ YbGJu0rfRUzqmQzPKf8A/q2M2XIjLscvg5A3nvqvscTHQ4QFF+7yaPdKLHTTBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641940693; a=rsa-sha256; cv=none; b=Gm0RLFg+uSEItD6/R7/e1xzm1vOsGxuQ7+xvQj6SlynaItZzInHmv6/CcEOGiyESfmnU6t Ao/WQe+2yJqWZKUwmpAv1KDBZuLNMzxl8mOlkkXzzQfUl4JmUgEDF8M64ZOBcTZMcJHHr2 pqtN/+fJF87sEXG1/zOyrY/1Aqj2swG/XlUoJkfPqa9tt+mnyBRMW0tM++DwAJSfbEk07x 1iHDhT8oPiZGeR3a02AK5fj0mu/ONYoUmLrWCUiguyKir4PdKo6F1VyjFvHlBjFGERGlQq 2WZchdGdxyFKH0x/MBJrNwisHNAHN/NWfa7JXlE2tKevUmcaiHmNFWvwTWdd/Q== 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=69e533c3ffcf272da76e6192bff0ecc10fa182ff commit 69e533c3ffcf272da76e6192bff0ecc10fa182ff Author: John Baldwin AuthorDate: 2022-01-11 22:20:10 +0000 Commit: John Baldwin CommitDate: 2022-01-11 22:20:10 +0000 swcr_encdec: Rename blks to blksz. This better reflects the variables purpose and matches other functions in this file. Requested by: markj Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33755 --- sys/opencrypto/cryptosoft.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c index 78fa786f0f72..864873944fd4 100644 --- a/sys/opencrypto/cryptosoft.c +++ b/sys/opencrypto/cryptosoft.c @@ -106,7 +106,7 @@ swcr_encdec(const struct swcr_session *ses, struct cryptop *crp) const struct swcr_encdec *sw; void *ctx; size_t inlen, outlen, todo; - int blks, resid; + int blksz, resid; struct crypto_buffer_cursor cc_in, cc_out; const unsigned char *inblk; unsigned char *outblk; @@ -124,9 +124,9 @@ swcr_encdec(const struct swcr_session *ses, struct cryptop *crp) if ((crp->crp_payload_length % exf->blocksize) != 0) return (EINVAL); - blks = exf->blocksize; + blksz = exf->blocksize; } else - blks = exf->native_blocksize; + blksz = exf->native_blocksize; if (exf == &enc_xform_aes_icm && (crp->crp_flags & CRYPTO_F_IV_SEPARATE) == 0) @@ -162,23 +162,23 @@ swcr_encdec(const struct swcr_session *ses, struct cryptop *crp) * 'outlen' is the remaining length of current segment in the * output buffer. */ - for (resid = crp->crp_payload_length; resid >= blks; resid -= todo) { + for (resid = crp->crp_payload_length; resid >= blksz; resid -= todo) { /* * If the current block is not contained within the * current input/output segment, use 'blk' as a local * buffer. */ - if (inlen < blks) { - crypto_cursor_copydata(&cc_in, blks, blk); + if (inlen < blksz) { + crypto_cursor_copydata(&cc_in, blksz, blk); inblk = blk; - inlen = blks; + inlen = blksz; } - if (outlen < blks) { + if (outlen < blksz) { outblk = blk; - outlen = blks; + outlen = blksz; } - todo = rounddown2(MIN(resid, MIN(inlen, outlen)), blks); + todo = rounddown2(MIN(resid, MIN(inlen, outlen)), blksz); if (encrypting) exf->encrypt_multi(ctx, inblk, outblk, todo); @@ -196,7 +196,7 @@ swcr_encdec(const struct swcr_session *ses, struct cryptop *crp) } if (outblk == blk) { - crypto_cursor_copyback(&cc_out, blks, blk); + crypto_cursor_copyback(&cc_out, blksz, blk); outblk = crypto_cursor_segment(&cc_out, &outlen); } else { crypto_cursor_advance(&cc_out, todo); @@ -213,7 +213,7 @@ swcr_encdec(const struct swcr_session *ses, struct cryptop *crp) KASSERT(exf->native_blocksize != 0, ("%s: partial block of %d bytes for cipher %s", __func__, resid, exf->name)); - KASSERT(resid < blks, ("%s: partial block too big", __func__)); + KASSERT(resid < blksz, ("%s: partial block too big", __func__)); inblk = crypto_cursor_segment(&cc_in, &inlen); outblk = crypto_cursor_segment(&cc_out, &outlen);