瀏覽代碼

gpg key generation

Bob Mottram 7 年之前
父節點
當前提交
f0692f51fe
共有 3 個檔案被更改,包括 4 行新增4 行删除
  1. 1
    1
      src/freedombone-adduser
  2. 2
    2
      src/freedombone-base-email
  3. 1
    1
      src/freedombone-utils-backup

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

@@ -144,7 +144,7 @@ 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 146
 chown $ADD_USERNAME:$ADD_USERNAME /home/$ADD_USERNAME/gpg-genkey.conf
147
-su -m root -c "gpg --homedir /home/$ADD_USERNAME/.gnupg --batch --passphrase '' --gen-key /home/$ADD_USERNAME/gpg-genkey.conf" - $ADD_USERNAME
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 148
 chown -R $ADD_USERNAME:$ADD_USERNAME /home/$ADD_USERNAME/.gnupg
149 149
 shred -zu /home/$ADD_USERNAME/gpg-genkey.conf
150 150
 MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADD_USERNAME" "$ADD_USERNAME@$HOSTNAME")

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

@@ -1499,7 +1499,7 @@ function create_gpg_subkey {
1499 1499
     echo "Name-Comment: $GPG_KEY_USAGE" >> /home/$MY_USERNAME/gpg-genkey.conf
1500 1500
     echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1501 1501
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
1502
-    su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
1502
+    su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
1503 1503
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1504 1504
 
1505 1505
     shred -zu /home/$MY_USERNAME/gpg-genkey.conf
@@ -1614,7 +1614,7 @@ function configure_gpg {
1614 1614
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1615 1615
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
1616 1616
         echo $'Generating a new GPG key'
1617
-        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
1617
+        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --full-gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
1618 1618
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1619 1619
         KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
1620 1620
         if [[ $KEY_EXISTS == "no" ]]; then

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

@@ -72,7 +72,7 @@ function configure_backup_key {
72 72
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
73 73
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
74 74
         echo $'Backup key does not exist. Creating it.'
75
-        su -m root -c "gpg --homedir /home/$MY_USERNAME/.gnupg --batch --passphrase '' --gen-key /home/$MY_USERNAME/gpg-genkey.conf" - $MY_USERNAME
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 76
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
77 77
 
78 78
         shred -zu /home/$MY_USERNAME/gpg-genkey.conf