free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use homedir for gpg export and import

This commit is contained in:
Bob Mottram 2017-06-23 17:59:15 +01:00
parent 839e129c5f
commit 22e6e4ae62
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/freedombone-keydrive
View File

@ -145,17 +145,17 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
export GPG_TTY export GPG_TTY
USER_EMAIL_ADDRESS=$MY_USERNAME@$HOSTNAME USER_EMAIL_ADDRESS=$MY_USERNAME@$HOSTNAME
GPG_ID=$(gpg --list-keys $USER_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//') GPG_ID=$(su -m root -c "gpg --list-keys $USER_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//'" - $MY_USERNAME)
GPG_BACKUP_ID=$(gpg --list-keys "(backup key)" | sed -n '2p' | sed 's/^[ \t]*//') GPG_BACKUP_ID=$(su -m root -c "gpg --list-keys \"(backup key)\" | sed -n '2p' | sed 's/^[ \t]*//'" - $MY_USERNAME)
gpgerrstr=$'error' gpgerrstr=$'error'
gpgkey=$(gpg --armor --export $GPG_ID) gpgkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export $GPG_ID)
if [[ "$gpgkey" == *"$gpgerrstr"* ]]; then if [[ "$gpgkey" == *"$gpgerrstr"* ]]; then
echo $'Problem exporting public gpg key' echo $'Problem exporting public gpg key'
echo "$gpgkey" echo "$gpgkey"
exit 735282 exit 735282
fi fi
gpgprivkey=$(gpg --armor --export-secret-key $GPG_ID) gpgprivkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export-secret-key $GPG_ID)
if [[ "$gpgprivkey" == *"$gpgerrstr"* ]]; then if [[ "$gpgprivkey" == *"$gpgerrstr"* ]]; then
echo $'Problem exporting private gpg key' echo $'Problem exporting private gpg key'
echo "$gpgprivkey" echo "$gpgprivkey"
@ -163,17 +163,17 @@ if [[ $MASTER_DRIVE == "yes" || $MASTER_DRIVE == "y" || $MASTER_DRIVE == "1" ]];
exit 629362 exit 629362
fi fi
backupgpgkey=$(gpg --armor --export $GPG_BACKUP_ID) backupgpgkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export $GPG_BACKUP_ID)
if [[ "$backupgpgkey" == *"$gpgerrstr"* ]]; then if [[ "$backupgpgkey" == *"$gpgerrstr"* ]]; then
echo $'Problem exporting public gpg backup key' echo $'Problem exporting public gpg backup key'
echo "$backupgpgkey" echo "$backupgpgkey"
exit 735282 exit 735282
fi fi
backupgpgprivkey=$(gpg --armor --export-secret-key $GPG_BACKUP_ID) backupgpgprivkey=$(gpg --homedir=/home/$MY_USERNAME/.gnupg --armor --export-secret-key $GPG_BACKUP_ID)
if [[ "$backupgpgprivkey" == *"$gpgerrstr"* ]]; then if [[ "$backupgpgprivkey" == *"$gpgerrstr"* ]]; then
echo $'Problem exporting private gpg backup key' echo $'Problem exporting private gpg backup key'
echo "$backupgpgprivkey" echo "$backupgpgprivkey"
gpgprivkey= backupgpgprivkey=
exit 629362 exit 629362
fi fi

2
src/freedombone-recoverkey
View File

@ -174,7 +174,7 @@ fi
echo $'Key fragments recombined' echo $'Key fragments recombined'
# import the gpg key # import the gpg key
su -c "gpg --allow-secret-key-import --import $KEYS_FILE" - $MY_USERNAME gpg --homedir=/home/$MY_USERNAME/.gnupg --allow-secret-key-import --import $KEYS_FILE
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
echo $'Unable to import gpg key' echo $'Unable to import gpg key'
shred -zu $KEYS_FILE shred -zu $KEYS_FILE