Matt DeVillier
4c64ca631a
oem-factory-reset: Fix index used for default boot option
...
Since we sort the boot options prior to selecting the new default entry,
we need to use the index of the entry in the list prior to being sorted,
vs always setting it as 1. This fixes setting/booting of the default
OS target where the list entries are changed when calling sort.
Test: perform OEM factory reset with Fedora 32 installed, verify
default boot succeeds followng reset.
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
2020-07-29 00:24:01 -05:00
Matt DeVillier
009c10465a
oem-factory-reset: Parse BLS format grub files
...
The same grub parsing logic used in kexec-select-boot should
be used here as well, so copy it over.
Test: oem-factory-reset succeeds with Fedora 32 installed.
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
2020-07-29 00:23:50 -05:00
tlaurion
fbbdf67c57
Merge pull request #783 from MrChromebox/fix_hotp_verification
...
patches: Add patch to fix hotp-verification
2020-07-28 09:49:58 -04:00
Matt DeVillier
302f044e8e
patches: Add patch to fix hotp-verification
...
Commit 7ea13ee0
made some significant changes to Librem/Nitrokey
verification which broke both compilation and calls to hotp_initialize.
Fix them via a patch until it's fixed upstream.
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
2020-07-28 01:20:06 -05:00
tlaurion
1d6460a3cd
Merge pull request #774 from MrChromebox/update_lk_hotp_verification
...
modules/hotp-verification: update to upstream master
2020-07-25 22:56:53 -04:00
tlaurion
c89f67077c
Merge pull request #781 from MrChromebox/fix_hotp_id
...
seal-hotp: Fix HOTP key identification
2020-07-25 22:54:44 -04:00
Matt DeVillier
a89d5a2780
seal-hotp: Fix HOTP key identification
...
With current implementation, Librem Keys with VID 0x316d are
not identified properly; correct the if/else logic to resolve.
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
2020-07-24 12:45:44 -05:00
Matt DeVillier
efe30b72bf
modules/hotp-verification: update to upstream master
...
Update hotp-verification to Nitrokey upstream commit 03a198c4.
Test: build/boot Librem 13v4, verify Librem key verification functional.
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
2020-07-23 19:59:46 -05:00
tlaurion
7ea13ee000
Merge pull request #761 from Nitrokey/hotp-neutral
...
Fix branding issue with HOTP USB Security Dongles
2020-07-23 15:05:13 -04:00
tlaurion
d5262f11d4
Merge pull request #759 from Nitrokey/usb_label
...
Add partition Label to list of mount-usb
2020-07-18 22:33:03 -04:00
Alexander Paetzelt
d472c43c79
Fix quoting of variable
2020-07-15 09:49:00 +02:00
tlaurion
9719510f39
Merge pull request #776 from tlaurion/coreboot_481
...
coreboot: 4.8.1 fixed in Makefile, coreboot module and board configs
2020-07-12 11:51:15 -04:00
Thierry Laurion
5f067ea908
coreboot: 4.8.1 fixed in Makefile, coreboot module and board configs (coreboot_481) to facilitate newer coreboot version integration and testing without breaking old fixed boards
2020-07-10 12:37:11 -04:00
tlaurion
268d9d64ac
Merge pull request #773 from MrChromebox/revert_gpg_toolstack
...
Revert "upgrade gpg toolstack to latest versions"
2020-07-10 10:07:25 -04:00
Matt DeVillier
5cb45bbc99
Revert "upgrade gpg toolstack to latest versions"
...
This reverts commit 972c25de7d
.
This commit broke OEM factory reset functionality, so revert it
until the issue can be properly diagnosed.
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
2020-07-07 17:50:45 -05:00
tlaurion
54cb664ffc
Merge pull request #767 from MrChromebox/sysinfo_fixes
...
gui-init: Fix RAM and firmware version strings
2020-07-01 15:03:10 -04:00
Matt DeVillier
cdbd0fcf2a
gui-init: Fix RAM and firmware version strings
...
Show RAM in GB, since the calculation in MB is imprecise as
it excludes RAM allocated for GPU (eg).
Fix display of firmware version strings which contain spaces by
adjusting cut and simply chopping off the date at the end, which
is a fixed 10-char length.
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
2020-07-01 13:42:10 -05:00
Szczepan Zalega
9c9edb0cfc
Remove pkg-config and git version use
2020-06-30 16:00:04 +02:00
Szczepan Zalega
d3d4529545
GitlabCI: reset cache, and investigate
...
Calculate the uncompressed used cache space
Decrease retry count
2020-06-30 13:45:21 +02:00
alex-nitrokey
84b2f9b540
Re-arrange the order of label and device
2020-06-30 09:28:35 +02:00
tlaurion
8dc5b7616a
Merge pull request #756 from tlaurion/x230-hotp-verification_CBFS_fix
...
x230-htop-verification: coreboot CBFS_SIZE changed to 0x710000
2020-06-28 15:59:22 -04:00
tlaurion
d579e731b9
Merge pull request #659 from MrChromebox/mount-usb-status
...
mount-usb: provide useful output when loading kernel modules
2020-06-28 15:30:16 -04:00
tlaurion
94476bb470
Merge pull request #747 from MrChromebox/factory_reset_no_tpm
...
oem-factory-reset: Handle non-TPM case
2020-06-28 15:26:16 -04:00
tlaurion
cc572f4c68
Merge pull request #758 from Nitrokey/gpg-export
...
Add option to export pubkey
2020-06-28 15:08:36 -04:00
tlaurion
e6037a217e
Merge pull request #760 from Nitrokey/menu-systeminfo
...
Add systeminfo menu option
2020-06-28 15:04:41 -04:00
alex-nitrokey
53dc659c01
Replace libremkey_htop_* by hotp_*
2020-06-25 15:35:47 +02:00
alex-nitrokey
e418ecbf71
Fix MEMTOTAL calculation
2020-06-25 10:41:01 +02:00
alex-nitrokey
481082f2d8
Include adaption of @MrChromebox
...
See
5a3f599233
2020-06-25 10:40:25 +02:00
alex-nitrokey
20b07dd1b3
swap label and device and minor formatting change
2020-06-25 09:46:11 +02:00
alex-nitrokey
c2a2134eb2
Merge remote-tracking branch 'upstream/master' into hotp-neutral
2020-06-24 18:22:13 +02:00
alex-nitrokey
73c9d6efc8
Merge branch 'hotp-verification-update' into hotp-neutral-merge
2020-06-24 18:17:54 +02:00
alex-nitrokey
fecb9cfd80
Rename CONFIG_HOTP_BRANDING to HOTP_BRANDING
...
reason: it not a config option anymore
2020-06-24 18:12:56 +02:00
alex-nitrokey
2fe946ccbe
Fix termonology
2020-06-24 17:54:39 +02:00
alex-nitrokey
3236f0e170
Change name seal-libremkey -> seal-hotpkey
2020-06-24 17:45:08 +02:00
alex-nitrokey
5867fc516c
Store HOTP USB Security Key branding in /boot
2020-06-24 17:40:49 +02:00
alex-nitrokey
92b1826537
/boot needs to get mounted first
2020-06-24 17:36:53 +02:00
alex-nitrokey
aab2c327e3
Fix warning box title
2020-06-24 17:25:39 +02:00
alex-nitrokey
38ba257063
Include upstream updates of hotp_verification
2020-06-24 16:31:22 +02:00
alex-nitrokey
407778eb9a
Remove unintented paranthesis
2020-06-24 16:16:03 +02:00
alex-nitrokey
53b67d27a4
Prepare usage of /boot/kexec_hotp_key as branding
2020-06-24 16:11:41 +02:00
alex-nitrokey
c07f3b7f7c
Add systeminfo menu option
2020-06-24 10:07:36 +02:00
alex-nitrokey
6d29ab71f9
dd partition Label to menu list
2020-06-24 09:44:50 +02:00
alex-nitrokey
2763711083
Add option to export pubkey
2020-06-23 15:32:51 +02:00
Thierry Laurion
9798cf9c66
x230-htop-verification: coreboot CBFS_SIZE changed to 0x710000
...
as per https://github.com/osresearch/heads/pull/748/files#diff-540d604c350e8fd52c25559b642795fbR5
2020-06-20 11:04:32 -04:00
tlaurion
05c854753c
Merge pull request #625 from MrChromebox/tpm_luks
...
kexec-save-default: guard TPM LUKS usage with config option
2020-06-18 23:08:54 -04:00
tlaurion
fab603153b
Merge pull request #646 from alex-nitrokey/custom-userinfo
...
Add option to choose GnuPG userinfo during OEM reset
2020-06-17 14:00:31 -04:00
alex-nitrokey
28735a8c84
Add CONFIG_HOTP_BRANDING
2020-06-11 17:04:03 +02:00
alex-nitrokey
4069619ead
Rename libremkey-hotp-verification module
2020-06-11 15:54:10 +02:00
alex-nitrokey
fc8c7b0e64
Merge branch 'hotp-verification-update' into hotp-neutral
2020-06-11 15:44:53 +02:00
alex-nitrokey
342431746d
Quick fix to build
2020-06-11 15:39:12 +02:00