Skip to content

Commit

Permalink
Part #2. Corrections on language
Browse files Browse the repository at this point in the history
  • Loading branch information
tlaurion committed Apr 4, 2019
1 parent eb29f68 commit 91a42e6
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions initrd/bin/kexec-seal-key
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# This will generate a disk encryption key and seal / ecncrypt
# This will generate a Disk Unlock Key and seal / encrypt
# with the current PCRs and then store it in the TPM NVRAM.
# It will then need to be bundled into initrd that is booted.
set -e -o pipefail
Expand Down Expand Up @@ -35,20 +35,20 @@ if [ -r "$KEY_LVM" ]; then
|| die "$VOLUME_GROUP: Unable to activate volume group"
fi

# Key slot 0 is the manual recovery pass phrase
# that the user entered when they installed Qubes,
# key slot 1 is the one that we've generated.
read -s -p "Enter disk recovery key: " disk_password
# Key slot 0 is the Disk Recovery Key
# that the user/OEM entered when they installed/reencrypted the Operating System (LUKS container)
# key slot 1 is the Disk Unlock Key that the user generated.
read -s -p "Enter Disk Recovery Key passphrase: " disk_password
echo -n "$disk_password" > "$RECOVERY_KEY"
echo

read -s -p "New disk unlock password for booting: " key_password
read -s -p "New Disk Unlock Key passphrase for booting Operating System: " key_password
echo
read -s -p "Repeat unlock code: " key_password2
read -s -p "Repeat Disk Unlock Key passphrase: " key_password2
echo

if [ "$key_password" != "$key_password2" ]; then
die "Key passwords do not match"
die "Disk Unlock Key passphrases did not match"
fi

# Generate key file
Expand Down
2 changes: 1 addition & 1 deletion initrd/bin/kexec-unseal-key
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ tpm nv_readvalue \
|| die "Unable to read key from TPM NVRAM"

for tries in 1 2 3; do
read -s -p "Enter TPM Owner password (blank to abort): " tpm_password
read -s -p "Enter LUKS Disk Unlock password (blank to abort): " tpm_password
echo

if [ -z "$tpm_password" ]; then
Expand Down

0 comments on commit 91a42e6

Please sign in to comment.