瀏覽代碼

Avoid passphrase during gpg key generation

Bob Mottram 7 年之前
父節點
當前提交
55e3f4a8ae
共有 3 個文件被更改,包括 8 次插入4 次删除
  1. 2
    1
      src/freedombone-adduser
  2. 4
    2
      src/freedombone-base-email
  3. 2
    1
      src/freedombone-utils-backup

+ 2
- 1
src/freedombone-adduser 查看文件

@@ -143,8 +143,9 @@ echo 'Subkey-Length: 4096' >> /home/$ADD_USERNAME/gpg-genkey.conf
143 143
 echo "Name-Real:  $ADD_USERNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
144 144
 echo "Name-Email: $ADD_USERNAME@$HOSTNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
145 145
 echo 'Expire-Date: 0' >> /home/$ADD_USERNAME/gpg-genkey.conf
146
+echo "Passphrase: ''" >> /home/$ADD_USERNAME/gpg-genkey.conf
146 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 149
 chown -R $ADD_USERNAME:$ADD_USERNAME /home/$ADD_USERNAME/.gnupg
149 150
 shred -zu /home/$ADD_USERNAME/gpg-genkey.conf
150 151
 MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADD_USERNAME" "$ADD_USERNAME@$HOSTNAME")

+ 4
- 2
src/freedombone-base-email 查看文件

@@ -1508,8 +1508,9 @@ function create_gpg_subkey {
1508 1508
     echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1509 1509
     echo "Name-Comment: $GPG_KEY_USAGE" >> /home/$MY_USERNAME/gpg-genkey.conf
1510 1510
     echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1511
+    echo "Passphrase: ''" >> /home/$MY_USERNAME/gpg-genkey.conf
1511 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 1514
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1514 1515
 
1515 1516
     shred -zu /home/$MY_USERNAME/gpg-genkey.conf
@@ -1622,9 +1623,10 @@ function configure_gpg {
1622 1623
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
1623 1624
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1624 1625
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1626
+        echo "Passphrase: ''" >> /home/$MY_USERNAME/gpg-genkey.conf
1625 1627
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
1626 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 1630
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1629 1631
         KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
1630 1632
         if [[ $KEY_EXISTS == "no" ]]; then

+ 2
- 1
src/freedombone-utils-backup 查看文件

@@ -70,9 +70,10 @@ function configure_backup_key {
70 70
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
71 71
         echo "Name-Comment: backup key" >> /home/$MY_USERNAME/gpg-genkey.conf
72 72
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
73
+        echo "Passphrase: ''" >> /home/$MY_USERNAME/gpg-genkey.conf
73 74
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
74 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 77
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
77 78
 
78 79
         shred -zu /home/$MY_USERNAME/gpg-genkey.conf