From nobody Tue Jan 24 22:10:16 2023 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 4P1h3s1YhMz3bdds; Tue, 24 Jan 2023 22:10:17 +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 4P1h3s0g3Kz4JfH; Tue, 24 Jan 2023 22:10:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598217; 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=b6Pl2EwIwj6WW1PWkVhAjN05ephjZ0vpvHX/T9enEUU=; b=I2LtD0Lb2fctvM9SRrtp9lyua/m+mgIJzW9xUwLwyQ1xNkGV+Uo2Iow51OOk3b1s+BdWtz Mz1p0Xq59tZZ0dUIFSnlMsEwfPVOSjna26s5xUwCRRaKY7jWTZsZQoi52o2byEIjxGrGer tptnqYKSc3fk51dsP2LsQVF9IkRdGhFMyySUp5B8xb1p2Ihc+NpIO19ka3IY6Oy6L/B/Kz aaw6XyNQecxsMrKUtFHggyXvrumY+Qaa6P8vsQRLs57K/rjjNrOpClm3+53XbIni3uo57p UTfHXjn0QjDJvO3HCw6E7p1kQInpOZuUhJT/2AW3TjZnORTbYS1smSs1FyUBYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598217; 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=b6Pl2EwIwj6WW1PWkVhAjN05ephjZ0vpvHX/T9enEUU=; b=Dx/feB3BNL4IfkHed1+Daho1hNEgNqMWju+cye4hn8dV+XE63p9bqw8KOa9Ad93BV7ENm5 ya3qaJ8vWleHiLEP8JnKVbLYNyJH3mIRCow2x5DKgJVUvhkWr1dlAGFMJpPBeVR1zvjJqt mQ9YNpnVhfylNK0lVUFVBaAsPr8Gaqnk//sDfZlvO1ThBGbFTUOIRNpnd8g9B+Hy9D2KXk ZhBY6wtBHujLa92Si4knLuq1F108Y0zHhgpGAQ0/xXECuhKtu5xC8Nf7nIz2cQYVGPNg3c IQb1eGeUAMA5+/mKe+8PW+vmGHB4j9N3QqW21VmpJA49Xi7WeFE1Sar1HViAeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598217; a=rsa-sha256; cv=none; b=RrE6abafyMyb99o8TnBpFgxCq/YCyY1ydrEdiOnCOp4K5jOG90seTYke4nqtNwNoZpm6PF sOgVgVX9dCjMiJAmwLodvRIvCUQpFM85KdKMVVSPe8XC42gdaQodUzwKFY0VCg30y8+4Cp CobTXrArgPwshVTHlEd4lLGotX70JCZJJGvfNqkn6WW1mzBMFEig/dDXruTfZK+tVh4xis e31Mtc++ex4RehoMwRbE16gW7R0EGf5GZVoQIVr/l8nUH4DUnEgtoxyTEQavGEowGszZVs hajqSrMrS9D+Jc7cb85iBJGXTszgX6l9gdsKQ7Y3wVcfp47S0elp/C2YnnfXeg== 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 4P1h3r6fkKzQ1F; Tue, 24 Jan 2023 22:10:16 +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 30OMAGjb079527; Tue, 24 Jan 2023 22:10:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAGDM079521; Tue, 24 Jan 2023 22:10:16 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:16 GMT Message-Id: <202301242210.30OMAGDM079521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 673910f3b8c4 - stable/13 - geliboot: Use the correct IV length for AES-XTS. 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 673910f3b8c4606313bd8e56a44ea43508dee0cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=673910f3b8c4606313bd8e56a44ea43508dee0cc commit 673910f3b8c4606313bd8e56a44ea43508dee0cc Author: John Baldwin AuthorDate: 2022-01-14 01:19:54 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:20 +0000 geliboot: Use the correct IV length for AES-XTS. - Use AES_XTS_IV_LEN instead of the key length as the IV length. - Use G_ELI_IVKEYLEN as the size of the zeroed iv[] array in g_eli_crypto_cipher() to match geli_io(). PR: 261172 Reported by: Malcolm Matalka , mikael Reviewed by: markj Sponsored by: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33884 (cherry picked from commit c7721958ffa1aa81064b74b884e81efbe11d7fe4) --- stand/libsa/geli/geliboot.c | 2 +- stand/libsa/geli/geliboot_crypto.c | 9 ++++----- stand/libsa/geli/geliboot_internal.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/stand/libsa/geli/geliboot.c b/stand/libsa/geli/geliboot.c index aee28e8ec761..f7069e3887ee 100644 --- a/stand/libsa/geli/geliboot.c +++ b/stand/libsa/geli/geliboot.c @@ -345,7 +345,7 @@ geli_io(struct geli_dev *gdev, geli_op_t enc, off_t offset, u_char *buf, g_eli_key_fill(&gdev->sc, &gkey, keyno); error = geliboot_crypt(gdev->sc.sc_ealgo, enc, pbuf, secsize, - gkey.gek_key, gdev->sc.sc_ekeylen, iv, sizeof(iv)); + gkey.gek_key, gdev->sc.sc_ekeylen, iv); if (error != 0) { explicit_bzero(&gkey, sizeof(gkey)); diff --git a/stand/libsa/geli/geliboot_crypto.c b/stand/libsa/geli/geliboot_crypto.c index fcc5d7bcd7fb..2cdd4483d323 100644 --- a/stand/libsa/geli/geliboot_crypto.c +++ b/stand/libsa/geli/geliboot_crypto.c @@ -36,7 +36,7 @@ int geliboot_crypt(u_int algo, geli_op_t enc, u_char *data, size_t datasize, - const u_char *key, size_t keysize, u_char *iv, size_t ivlen) + const u_char *key, size_t keysize, u_char *iv) { keyInstance aeskey; cipherInstance cipher; @@ -81,7 +81,7 @@ geliboot_crypt(u_int algo, geli_op_t enc, u_char *data, size_t datasize, ctxp = &xtsctx; enc_xform_aes_xts.setkey(ctxp, key, xts_len / 8); - enc_xform_aes_xts.reinit(ctxp, iv, ivlen); + enc_xform_aes_xts.reinit(ctxp, iv, AES_XTS_IV_LEN); switch (enc) { case GELI_DECRYPT: @@ -110,11 +110,10 @@ static int g_eli_crypto_cipher(u_int algo, geli_op_t enc, u_char *data, size_t datasize, const u_char *key, size_t keysize) { - u_char iv[keysize]; + u_char iv[G_ELI_IVKEYLEN]; explicit_bzero(iv, sizeof(iv)); - return (geliboot_crypt(algo, enc, data, datasize, key, keysize, iv, - sizeof(iv))); + return (geliboot_crypt(algo, enc, data, datasize, key, keysize, iv)); } int diff --git a/stand/libsa/geli/geliboot_internal.h b/stand/libsa/geli/geliboot_internal.h index 2318690297f8..2af74466179f 100644 --- a/stand/libsa/geli/geliboot_internal.h +++ b/stand/libsa/geli/geliboot_internal.h @@ -68,6 +68,6 @@ struct geli_dev { }; int geliboot_crypt(u_int algo, geli_op_t enc, u_char *data, size_t datasize, - const u_char *key, size_t keysize, u_char *iv, size_t ivlen); + const u_char *key, size_t keysize, u_char *iv); #endif /* _GELIBOOT_INTERNAL_H_ */