[Buildroot] [PATCH 1/2] package/cryptsetup: add nettle support

[Buildroot] [PATCH 1/2] package/cryptsetup: add nettle support

[Fabrice Fontaine]

nettle is a crypto backend since version 1.3.1 and
https://github.com/mbroz/cryptsetup/commit/35d6914779578908e7b37abfdd188ec7c8101404

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/cryptsetup/cryptsetup.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 0f5c2dc5ae..6fdda78fe2 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -25,8 +25,8 @@ CRYPTSETUP_AUTORECONF = YES
 CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
 CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2
 
-# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt
-# or kernel crypto modules instead
+# cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt,
+# nettle or kernel crypto modules instead
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 CRYPTSETUP_DEPENDENCIES += openssl
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl
@@ -34,6 +34,9 @@ else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 CRYPTSETUP_DEPENDENCIES += libgcrypt
 CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt
+else ifeq ($(BR2_PACKAGE_NETTLE),y)
+CRYPTSETUP_DEPENDENCIES += nettle
+CRYPTSETUP_CONF_OPTS += --with-crypto_backend=nettle
 else
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel
 endif
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/cryptsetup: add libnss support

[Fabrice Fontaine]

libnss is a crypto backend since version 1.3.0 and
https://github.com/mbroz/cryptsetup/commit/7b6eda0d273eb514bf2c1f834a5af019f614f606

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/cryptsetup/cryptsetup.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 6fdda78fe2..20cf5d6346 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -26,7 +26,7 @@ CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
 CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2
 
 # cryptsetup uses OpenSSL by default, but can be configured to use libgcrypt,
-# nettle or kernel crypto modules instead
+# nettle, libnss or kernel crypto modules instead
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 CRYPTSETUP_DEPENDENCIES += openssl
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl
@@ -37,6 +37,9 @@ CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt
 else ifeq ($(BR2_PACKAGE_NETTLE),y)
 CRYPTSETUP_DEPENDENCIES += nettle
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=nettle
+else ifeq ($(BR2_PACKAGE_LIBNSS),y)
+CRYPTSETUP_DEPENDENCIES += libnss
+CRYPTSETUP_CONF_OPTS += --with-crypto_backend=nss
 else
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel
 endif
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/cryptsetup: add nettle support

[Thomas Petazzoni via buildroot]

On Wed, 27 Jul 2022 11:47:18 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> nettle is a crypto backend since version 1.3.1 and
> https://github.com/mbroz/cryptsetup/commit/35d6914779578908e7b37abfdd188ec7c8101404
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/cryptsetup/cryptsetup.mk | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)

Both applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot