Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GPG2 Fixes #505

Merged
merged 4 commits into from
Jan 26, 2019
Merged

GPG2 Fixes #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
765bdbc
Removed --no-tty as it disables the card admin PIN pinentry
itay-grudev Jan 3, 2019
979dc68
Enabled GPG2 in the Librem board config
itay-grudev Jan 4, 2019
2b7c3b8
Disabled libsecret support in the pinentry module
itay-grudev Jan 4, 2019
142d601
Code style fix
itay-grudev Jan 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions boards/librem13v2/librem13v2.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions boards/librem15v3/librem15v3.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion initrd/bin/kexec-sign-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions modules/pinentry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down