ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oem-factory-reset ash_functions: fix USB Security Dongle' smartcard -> USB Security Dongle's smartcard

Browse Source 
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
This commit is contained in:
Thierry Laurion 2023-11-02 12:08:52 -04:00
parent 48c446cd7d
commit 85266452fa
No known key found for this signature in database
GPG Key ID: E7B4A71658E36A93
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
initrd/bin/oem-factory-reset
View File

@ -436,7 +436,7 @@ gpg_key_factory_reset() {
enable_usb
# Factory reset GPG card
echo "GPG factory reset of USB Security Dongle' smartcard..."
echo "GPG factory reset of USB Security Dongle's smartcard..."
{
echo admin # admin menu
echo factory-reset # factory reset smartcard
@ -520,7 +520,7 @@ generate_OEM_gpg_keys() {
TRACE "Under oem-factory-reset:generate_OEM_gpg_keys"
#This function simply generates subkeys in smartcard following smarcard config from gpg_key_factory_reset
echo "Generating GPG keys in USB Security Dongle' smartcard..."
echo "Generating GPG keys in USB Security Dongle's smartcard..."
{
echo admin # admin menu
echo generate # generate keys
@ -873,21 +873,21 @@ if [ "$use_defaults" == "n" -o "$use_defaults" == "N" ]; then
; then
GPG_GEN_KEY_IN_MEMORY=1
echo " ++++ Master key and subkeys will be generated in memory, backed up to dedicated LUKS container +++"
echo -e -n "Would you like in-memory generated subkeys to be copied to USB Security Dongle' smartcard?\n (Highly recommended so the smartcard is used on daily basis and backup is kept safe, but not required) [Y/n]: "
echo -e -n "Would you like in-memory generated subkeys to be copied to USB Security Dongle's smartcard?\n (Highly recommended so the smartcard is used on daily basis and backup is kept safe, but not required) [Y/n]: "
read -n 1 prompt_output
echo
if [ "$prompt_output" == "n" \
-o "$prompt_output" == "N" ]; then
warn "Subkeys will NOT be copied to USB Security Dongle' smartcard."
warn "Subkeys will NOT be copied to USB Security Dongle's smartcard."
warn "Your GPG key material backup thumb drive should be cloned to a second thumb drive for redundancy for production environements"
GPG_GEN_KEY_IN_MEMORY_COPY_TO_SMARTCARD=0
else
echo "++++ Subkeys will be copied to USB Security Dongle' smartcard ++++"
echo "++++ Subkeys will be copied to USB Security Dongle's smartcard ++++"
warn "Please keep your GPG key material backup thumb drive safe"
GPG_GEN_KEY_IN_MEMORY_COPY_TO_SMARTCARD=1
fi
else
warn "GPG key material will be generated on USB Security Dongle' smartcard without backup"
warn "GPG key material will be generated on USB Security Dongle's smartcard without backup"
GPG_GEN_KEY_IN_MEMORY=0
fi

2
initrd/etc/ash_functions
View File

@ -123,7 +123,7 @@ confirm_gpg_card() {
fi
fi
# setup the USB so we can reach the USB Security Dongle' smartcard
# setup the USB so we can reach the USB Security Dongle's smartcard
enable_usb
echo -e "\nVerifying presence of GPG card...\n"