From nobody Thu Dec 16 22:09:28 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 5E33D18D95B8; Thu, 16 Dec 2021 22:09:29 +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 4JFR9N3Nkhz3CVL; Thu, 16 Dec 2021 22:09:28 +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 2D0E17FC1; Thu, 16 Dec 2021 22:09:28 +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 1BGM9SpN089162; Thu, 16 Dec 2021 22:09:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BGM9SU7089161; Thu, 16 Dec 2021 22:09:28 GMT (envelope-from git) Date: Thu, 16 Dec 2021 22:09:28 GMT Message-Id: <202112162209.1BGM9SU7089161@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: d55df8dcf7ec - main - crypto: Move CBC handling into enc_xform_aes_cbc. 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: d55df8dcf7ecb7f12bb113b3cdcf91c7d5640352 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639692568; 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=t8Sgcgc3Q4EAJ2e6vU1+uNfYQH+5e4CEa67oH2aZr0I=; b=QA8CUxARzxP0wiqMn86lVxOzJwzaiF7ntgmG68n3PCRTkFmSITJ7PLw53KWMlsrQRaOW5j dDPB3AxbRqp3Z2Eg0UiTg1lNCOmpAVEGn2gY1irnD+6wTbR45JTGQA1E4zucrc4KDbbhQo Oo4g8OHjSTaafDhlbIFJh4LwMZVUKXqiv/fr+tjfbGtKLtakpmKOmEYjfY4VOkKGeDtA9q 5XgVgti+rv0juF6KwITfOz5DhP72ShTGw9/CZiJ9mdJa9LBpk2mQDW5lD5J14sgv68eIgk dDoynEsoLiOmGAbptYWTAzyH0TLT8aBJpbIE1rxRxfgyrafit7+Z2Lx03tZOeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639692568; a=rsa-sha256; cv=none; b=FHUhUft2I5k+0ZfFDG7TxT9npwdAie7YmLsmXETYyYHkOm6n01FZ3fqWq7ximp/5MRO3Vt qSYkRwYVcp8S9gVSyztU3U5j3Xg7qpIxR3ODFoF3URjg6XFqzV0k1i3TeQJpS/ZrPN/LTV qsxXgLg0yYIoGjtEoeHBRzFcf6vHRJ7biP//uWbPkzYRoar6Iy/gNsHZNTzp+nU1LW3tC4 cRyx8eAz1f071vZhixpeOQbOPBXccUVaMMFXuwKPVDPAWGvgIHbgb+yOQik8JmCp650i/d IoFDk7UUUnimofLyLge3NJndzXvPkNtZPYuSiFkjt8KVKI7O6XwdQkMwKMsfCQ== 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=d55df8dcf7ecb7f12bb113b3cdcf91c7d5640352 commit d55df8dcf7ecb7f12bb113b3cdcf91c7d5640352 Author: John Baldwin AuthorDate: 2021-12-16 21:47:44 +0000 Commit: John Baldwin CommitDate: 2021-12-16 21:47:44 +0000 crypto: Move CBC handling into enc_xform_aes_cbc. Add an IV to the context that is initialized by the reinit hook. Encrypt and decrypt operations handle cipher block chaining along with updating the IV saved in the context. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33487 --- sys/opencrypto/xform_aes_cbc.c | 44 +++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/sys/opencrypto/xform_aes_cbc.c b/sys/opencrypto/xform_aes_cbc.c index 38b7aeb33ec2..b2a45e595fda 100644 --- a/sys/opencrypto/xform_aes_cbc.c +++ b/sys/opencrypto/xform_aes_cbc.c @@ -53,15 +53,21 @@ __FBSDID("$FreeBSD$"); #include #include +struct aes_cbc_ctx { + rijndael_ctx key; + char iv[AES_BLOCK_LEN]; +}; + static int aes_cbc_setkey(void *, const uint8_t *, int); static void aes_cbc_encrypt(void *, const uint8_t *, uint8_t *); static void aes_cbc_decrypt(void *, const uint8_t *, uint8_t *); +static void aes_cbc_reinit(void *, const uint8_t *, size_t); /* Encryption instances */ const struct enc_xform enc_xform_aes_cbc = { .type = CRYPTO_AES_CBC, .name = "AES-CBC", - .ctxsize = sizeof(rijndael_ctx), + .ctxsize = sizeof(struct aes_cbc_ctx), .blocksize = AES_BLOCK_LEN, .ivsize = AES_BLOCK_LEN, .minkey = AES_MIN_KEY, @@ -69,30 +75,54 @@ const struct enc_xform enc_xform_aes_cbc = { .encrypt = aes_cbc_encrypt, .decrypt = aes_cbc_decrypt, .setkey = aes_cbc_setkey, + .reinit = aes_cbc_reinit, }; /* * Encryption wrapper routines. */ static void -aes_cbc_encrypt(void *key, const uint8_t *in, uint8_t *out) +aes_cbc_encrypt(void *vctx, const uint8_t *in, uint8_t *out) { - rijndael_encrypt(key, in, out); + struct aes_cbc_ctx *ctx = vctx; + + for (u_int i = 0; i < AES_BLOCK_LEN; i++) + out[i] = in[i] ^ ctx->iv[i]; + rijndael_encrypt(&ctx->key, out, out); + memcpy(ctx->iv, out, AES_BLOCK_LEN); } static void -aes_cbc_decrypt(void *key, const uint8_t *in, uint8_t *out) +aes_cbc_decrypt(void *vctx, const uint8_t *in, uint8_t *out) { - rijndael_decrypt(key, in, out); + struct aes_cbc_ctx *ctx = vctx; + char block[AES_BLOCK_LEN]; + + memcpy(block, in, AES_BLOCK_LEN); + rijndael_decrypt(&ctx->key, in, out); + for (u_int i = 0; i < AES_BLOCK_LEN; i++) + out[i] ^= ctx->iv[i]; + memcpy(ctx->iv, block, AES_BLOCK_LEN); + explicit_bzero(block, sizeof(block)); } static int -aes_cbc_setkey(void *sched, const uint8_t *key, int len) +aes_cbc_setkey(void *vctx, const uint8_t *key, int len) { + struct aes_cbc_ctx *ctx = vctx; if (len != 16 && len != 24 && len != 32) return (EINVAL); - rijndael_set_key(sched, key, len * 8); + rijndael_set_key(&ctx->key, key, len * 8); return (0); } + +static void +aes_cbc_reinit(void *vctx, const uint8_t *iv, size_t iv_len) +{ + struct aes_cbc_ctx *ctx = vctx; + + KASSERT(iv_len == sizeof(ctx->iv), ("%s: bad IV length", __func__)); + memcpy(ctx->iv, iv, sizeof(ctx->iv)); +}