* [Buildroot] [PATCH] package/cryptsetup: use external libargon2
@ 2019-12-04 8:05 Pascal de Bruijn
2019-12-08 20:59 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Pascal de Bruijn @ 2019-12-04 8:05 UTC (permalink / raw)
To: buildroot
don't use cryptsetup's intree libargon2
Signed-off-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
---
package/cryptsetup/Config.in | 1 +
package/cryptsetup/cryptsetup.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
index 14b897a..3f94847 100644
--- a/package/cryptsetup/Config.in
+++ b/package/cryptsetup/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_CRYPTSETUP
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_JSON_C
+ select BR2_PACKAGE_LIBARGON2
help
This tool helps manipulate dm-crypt and luks partitions for
on-disk encryption.
diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 7788bfb..b6d4df6 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -8,13 +8,13 @@ CRYPTSETUP_VERSION_MAJOR = 2.0
CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).6
CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
-CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c \
+CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c libargon2 \
$(TARGET_NLS_DEPENDENCIES)
CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
CRYPTSETUP_INSTALL_STAGING = YES
CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
-CRYPTSETUP_CONF_OPTS += --enable-blkid
+CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2
# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL
# or kernel crypto modules instead
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] package/cryptsetup: use external libargon2
2019-12-04 8:05 [Buildroot] [PATCH] package/cryptsetup: use external libargon2 Pascal de Bruijn
@ 2019-12-08 20:59 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2019-12-08 20:59 UTC (permalink / raw)
To: buildroot
On Wed, 4 Dec 2019 09:05:47 +0100
Pascal de Bruijn <p.debruijn@unilogic.nl> wrote:
> don't use cryptsetup's intree libargon2
>
> Signed-off-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
> ---
> package/cryptsetup/Config.in | 1 +
> package/cryptsetup/cryptsetup.mk | 4 ++--
> 2 files changed, 3 insertions(+), 2 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] package/cryptsetup: use external libargon2
2019-12-03 12:31 Pascal de Bruijn
@ 2019-12-03 21:18 ` Arnout Vandecappelle
0 siblings, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2019-12-03 21:18 UTC (permalink / raw)
To: buildroot
On 03/12/2019 13:31, Pascal de Bruijn wrote:
> don't use cryptsetup's intree libargon2
>
> Signed-off-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
> ---
> package/cryptsetup/Config.in | 1 +
> package/cryptsetup/cryptsetup.mk | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
> index 14b897a..3f94847 100644
> --- a/package/cryptsetup/Config.in
> +++ b/package/cryptsetup/Config.in
> @@ -10,6 +10,7 @@ config BR2_PACKAGE_CRYPTSETUP
> select BR2_PACKAGE_UTIL_LINUX_LIBUUID
> select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
> select BR2_PACKAGE_JSON_C
> + select BR2_PACKAGE_LIBARGON2
> help
> This tool helps manipulate dm-crypt and luks partitions for
> on-disk encryption.
> diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
> index 7788bfb..5ed5013 100644
> --- a/package/cryptsetup/cryptsetup.mk
> +++ b/package/cryptsetup/cryptsetup.mk
> @@ -14,7 +14,7 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
> CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
> CRYPTSETUP_INSTALL_STAGING = YES
> CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
> -CRYPTSETUP_CONF_OPTS += --enable-blkid
> +CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2
You also need to add it to CRYPTSETUP_DEPENDENCIES.
Regards,
Arnout
>
> # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL
> # or kernel crypto modules instead
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH] package/cryptsetup: use external libargon2
@ 2019-12-03 12:31 Pascal de Bruijn
2019-12-03 21:18 ` Arnout Vandecappelle
0 siblings, 1 reply; 4+ messages in thread
From: Pascal de Bruijn @ 2019-12-03 12:31 UTC (permalink / raw)
To: buildroot
don't use cryptsetup's intree libargon2
Signed-off-by: Pascal de Bruijn <p.debruijn@unilogic.nl>
---
package/cryptsetup/Config.in | 1 +
package/cryptsetup/cryptsetup.mk | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in
index 14b897a..3f94847 100644
--- a/package/cryptsetup/Config.in
+++ b/package/cryptsetup/Config.in
@@ -10,6 +10,7 @@ config BR2_PACKAGE_CRYPTSETUP
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
select BR2_PACKAGE_JSON_C
+ select BR2_PACKAGE_LIBARGON2
help
This tool helps manipulate dm-crypt and luks partitions for
on-disk encryption.
diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk
index 7788bfb..5ed5013 100644
--- a/package/cryptsetup/cryptsetup.mk
+++ b/package/cryptsetup/cryptsetup.mk
@@ -14,7 +14,7 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
CRYPTSETUP_INSTALL_STAGING = YES
CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
-CRYPTSETUP_CONF_OPTS += --enable-blkid
+CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2
# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL
# or kernel crypto modules instead
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-12-08 20:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-04 8:05 [Buildroot] [PATCH] package/cryptsetup: use external libargon2 Pascal de Bruijn
2019-12-08 20:59 ` Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2019-12-03 12:31 Pascal de Bruijn
2019-12-03 21:18 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.