From 765bdbc8ba74bbdc0296080b960677f901b2029e Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Thu, 3 Jan 2019 16:30:28 +0200 Subject: [PATCH 1/4] Removed --no-tty as it disables the card admin PIN pinentry --- initrd/bin/kexec-sign-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initrd/bin/kexec-sign-config b/initrd/bin/kexec-sign-config index 82f0cadb..3a614f0e 100755 --- a/initrd/bin/kexec-sign-config +++ b/initrd/bin/kexec-sign-config @@ -49,7 +49,7 @@ if [ -z "$param_files" ]; then fi for tries in 1 2 3; do - if sha256sum $param_files | gpg --no-tty\ + if sha256sum $param_files | gpg\ --digest-algo SHA256 \ --detach-sign \ -a \ From 979dc68c566e92c51c7d27a45f1fb5c8b537110a Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Fri, 4 Jan 2019 09:21:44 +0200 Subject: [PATCH 2/4] Enabled GPG2 in the Librem board config --- boards/librem13v2/librem13v2.config | 1 + boards/librem15v3/librem15v3.config | 1 + 2 files changed, 2 insertions(+) diff --git a/boards/librem13v2/librem13v2.config b/boards/librem13v2/librem13v2.config index 616a9472..87cfbd77 100644 --- a/boards/librem13v2/librem13v2.config +++ b/boards/librem13v2/librem13v2.config @@ -7,6 +7,7 @@ CONFIG_CRYPTSETUP=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y CONFIG_GPG=y +CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y diff --git a/boards/librem15v3/librem15v3.config b/boards/librem15v3/librem15v3.config index a9a194be..450933f8 100644 --- a/boards/librem15v3/librem15v3.config +++ b/boards/librem15v3/librem15v3.config @@ -9,6 +9,7 @@ CONFIG_CRYPTSETUP=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y CONFIG_GPG=y +CONFIG_GPG2=y CONFIG_KEXEC=y CONFIG_UTIL_LINUX=y CONFIG_LVM2=y From 2b7c3b80ebd49ad56a7d9c7af5a7c9c676fd256e Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Fri, 4 Jan 2019 09:33:13 +0200 Subject: [PATCH 3/4] Disabled libsecret support in the pinentry module --- modules/pinentry | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/pinentry b/modules/pinentry index c59b7043..7de67e20 100644 --- a/modules/pinentry +++ b/modules/pinentry @@ -18,6 +18,7 @@ pinentry_configure := ./configure \ --host x86_64-linux-musl \ --prefix "/" \ --enable-pinentry-tty \ + --disable-libsecret \ --disable-fallback-curses \ --disable-pinentry-curses \ --disable-pinentry-qt5 \ From 142d601f5383e5c21e646e04a47d60942978e209 Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Mon, 7 Jan 2019 11:07:54 +0200 Subject: [PATCH 4/4] Code style fix --- initrd/bin/kexec-sign-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initrd/bin/kexec-sign-config b/initrd/bin/kexec-sign-config index 3a614f0e..1ff9f46c 100755 --- a/initrd/bin/kexec-sign-config +++ b/initrd/bin/kexec-sign-config @@ -49,7 +49,7 @@ if [ -z "$param_files" ]; then fi for tries in 1 2 3; do - if sha256sum $param_files | gpg\ + if sha256sum $param_files | gpg \ --digest-algo SHA256 \ --detach-sign \ -a \