diff mbox series

[Concept,01/15] mbedtls: Allow use of XTS functions

Message ID	20251111124131.1198930-2-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Tue, 11 Nov 2025 05:41:07 -0700 Message-ID: <20251111124131.1198930-2-sjg@u-boot.org> In-Reply-To: <20251111124131.1198930-1-sjg@u-boot.org> References: <20251111124131.1198930-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: T6HXFSGFDYZOVISXD76PH2GSWZB7TJCP CC: Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <simon.glass@canonical.com>, Claude <noreply@anthropic.com> Precedence: list Subject: [Concept] [PATCH 01/15] mbedtls: Allow use of XTS functions Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/T6HXFSGFDYZOVISXD76PH2GSWZB7TJCP/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	luks: Provide support for LUKSv2 \| [Concept,00/15] luks: Provide support for LUKSv2 [Concept,01/15] mbedtls: Allow use of XTS functions [Concept,02/15] mbedtls: Allow use of base64 [Concept,03/15] test: Check for null string in assert functions [Concept,05/15] lib: Bring in argon2 library [Concept,06/15] lib: Adapt argon2 library for U-Boot [Concept,07/15] lib: Plumb in argon2 library [Concept,08/15] test: Shorten the encrypt_passphrase parameter for FsHelper [Concept,09/15] test: Add a way to create a LUKS2 partition with XTS [Concept,10/15] test: Switch mmc12 over to use argon2id [Concept,11/15] luks: Export the af_merge() function [Concept,12/15] luks: Tidy up the code style in the block driver [Concept,13/15] luks: Provide an implementation of luks2 [Concept,14/15] luks: Enable LUKSv2 support in the luks command

Commit Message

Simon Glass Nov. 11, 2025, 12:41 p.m. UTC

  From: Simon Glass <simon.glass@canonical.com>

Add a few Kconfig options to support XTS (XEX Tweakable Block Ciphertext
Stealing).

Co-developed-by: Claude <noreply@anthropic.com>
Signed-off-by: Simon Glass <simon.glass@canonical.com>
---

 lib/mbedtls/Makefile             | 4 ++++
 lib/mbedtls/mbedtls_def_config.h | 7 +++++++
 2 files changed, 11 insertions(+)

diff mbox series

Patch

diff --git a/lib/mbedtls/Makefile b/lib/mbedtls/Makefile
index 0506a5a6b3e..257f585c013 100644
--- a/lib/mbedtls/Makefile
+++ b/lib/mbedtls/Makefile
@@ -37,6 +37,10 @@  mbedtls_lib_crypto-$(CONFIG_$(PHASE_)HKDF_MBEDTLS) += \
 	$(MBEDTLS_LIB_DIR)/hkdf.o
 mbedtls_lib_crypto-$(CONFIG_$(PHASE_)PKCS5_MBEDTLS) += \
 	$(MBEDTLS_LIB_DIR)/pkcs5.o
+mbedtls_lib_crypto-$(CONFIG_$(PHASE_)BLK_LUKS) += \
+	$(MBEDTLS_LIB_DIR)/aes.o \
+	$(MBEDTLS_LIB_DIR)/cipher.o \
+	$(MBEDTLS_LIB_DIR)/cipher_wrap.o
 
 # MbedTLS X509 library
 obj-$(CONFIG_$(XPL_)MBEDTLS_LIB_X509) += mbedtls_lib_x509.o
diff --git a/lib/mbedtls/mbedtls_def_config.h b/lib/mbedtls/mbedtls_def_config.h
index 9e3beed07f4..a0578d33ba6 100644
--- a/lib/mbedtls/mbedtls_def_config.h
+++ b/lib/mbedtls/mbedtls_def_config.h
@@ -64,6 +64,12 @@ 
 #define MBEDTLS_PKCS5_C
 #endif
 
+#if CONFIG_IS_ENABLED(BLK_LUKS)
+#define MBEDTLS_CIPHER_C
+#define MBEDTLS_CIPHER_MODE_XTS
+#define MBEDTLS_AES_C
+#endif
+
 #if CONFIG_IS_ENABLED(MBEDTLS_LIB_X509)
 
 #if CONFIG_IS_ENABLED(X509_CERTIFICATE_PARSER)
@@ -104,6 +110,7 @@ 
 #define MBEDTLS_SSL_CLI_C
 #define MBEDTLS_SSL_TLS_C
 #define MBEDTLS_CIPHER_C
+#define MBEDTLS_CIPHER_MODE_XTS
 #define MBEDTLS_MD_C
 #define MBEDTLS_CTR_DRBG_C
 #define MBEDTLS_AES_C