Ver código fonte

Avoid passphrase during gpg key generation

Bob Mottram 7 anos atrás
pai
commit
55e3f4a8ae

+ 2
- 1
src/freedombone-adduser Ver arquivo

143
 echo "Name-Real:  $ADD_USERNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
143
 echo "Name-Real:  $ADD_USERNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
144
 echo "Name-Email: $ADD_USERNAME@$HOSTNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
144
 echo "Name-Email: $ADD_USERNAME@$HOSTNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
145
 echo 'Expire-Date: 0' >> /home/$ADD_USERNAME/gpg-genkey.conf
145
 echo 'Expire-Date: 0' >> /home/$ADD_USERNAME/gpg-genkey.conf
146
+echo "Passphrase: ''" >> /home/$ADD_USERNAME/gpg-genkey.conf
146
 chown $ADD_USERNAME:$ADD_USERNAME /home/$ADD_USERNAME/gpg-genkey.conf
147
 chown $ADD_USERNAME:$ADD_USERNAME /home/$ADD_USERNAME/gpg-genkey.conf
147
-su -m root -c "gpg --homedir /home/$ADD_USERNAME/.gnupg --batch --passphrase '' --full-gen-key /home/$ADD_USERNAME/gpg-genkey.conf" - $ADD_USERNAME
148
+su -m root -c "gpg --homedir /home/$ADD_USERNAME/.gnupg --batch --full-gen-key /home/$ADD_USERNAME/gpg-genkey.conf" - $ADD_USERNAME
148
 chown -R $ADD_USERNAME:$ADD_USERNAME /home/$ADD_USERNAME/.gnupg
149
 chown -R $ADD_USERNAME:$ADD_USERNAME /home/$ADD_USERNAME/.gnupg
149
 shred -zu /home/$ADD_USERNAME/gpg-genkey.conf
150
 shred -zu /home/$ADD_USERNAME/gpg-genkey.conf
150
 MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADD_USERNAME" "$ADD_USERNAME@$HOSTNAME")
151
 MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADD_USERNAME" "$ADD_USERNAME@$HOSTNAME")

+ 4
- 2
src/freedombone-base-email Ver arquivo

1508
     echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1508
     echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1509
     echo "Name-Comment: $GPG_KEY_USAGE" >> /home/$MY_USERNAME/gpg-genkey.conf
1509
     echo "Name-Comment: $GPG_KEY_USAGE" >> /home/$MY_USERNAME/gpg-genkey.conf
1510
     echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1510
     echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1511
+    echo "Passphrase: ''" >> /home/$MY_USERNAME/gpg-genkey.conf
1511
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
1512
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
1512
-    su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
1513
+    su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
1513
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1514
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1514
 
1515
 
1515
     shred -zu /home/$MY_USERNAME/gpg-genkey.conf
1516
     shred -zu /home/$MY_USERNAME/gpg-genkey.conf
1622
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
1623
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
1623
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1624
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1624
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1625
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1626
+        echo "Passphrase: ''" >> /home/$MY_USERNAME/gpg-genkey.conf
1625
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
1627
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
1626
         echo $'Generating a new GPG key'
1628
         echo $'Generating a new GPG key'
1627
-        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
1629
+        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
1628
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1630
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1629
         KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
1631
         KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
1630
         if [[ $KEY_EXISTS == "no" ]]; then
1632
         if [[ $KEY_EXISTS == "no" ]]; then

+ 2
- 1
src/freedombone-utils-backup Ver arquivo

70
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
70
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
71
         echo "Name-Comment: backup key" >> /home/$MY_USERNAME/gpg-genkey.conf
71
         echo "Name-Comment: backup key" >> /home/$MY_USERNAME/gpg-genkey.conf
72
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
72
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
73
+        echo "Passphrase: ''" >> /home/$MY_USERNAME/gpg-genkey.conf
73
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
74
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
74
         echo $'Backup key does not exist. Creating it.'
75
         echo $'Backup key does not exist. Creating it.'
75
-        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
76
+        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
76
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
77
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
77
 
78
 
78
         shred -zu /home/$MY_USERNAME/gpg-genkey.conf
79
         shred -zu /home/$MY_USERNAME/gpg-genkey.conf