浏览代码

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
 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
 chown $ADD_USERNAME:$ADD_USERNAME /home/$ADD_USERNAME/gpg-genkey.conf
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
 chown -R $ADD_USERNAME:$ADD_USERNAME /home/$ADD_USERNAME/.gnupg
148
 chown -R $ADD_USERNAME:$ADD_USERNAME /home/$ADD_USERNAME/.gnupg
149
 shred -zu /home/$ADD_USERNAME/gpg-genkey.conf
149
 shred -zu /home/$ADD_USERNAME/gpg-genkey.conf
150
 MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADD_USERNAME" "$ADD_USERNAME@$HOSTNAME")
150
 MY_GPG_PUBLIC_KEY_ID=$(gpg_pubkey_from_email "$ADD_USERNAME" "$ADD_USERNAME@$HOSTNAME")

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

1499
     echo "Name-Comment: $GPG_KEY_USAGE" >> /home/$MY_USERNAME/gpg-genkey.conf
1499
     echo "Name-Comment: $GPG_KEY_USAGE" >> /home/$MY_USERNAME/gpg-genkey.conf
1500
     echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1500
     echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1501
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
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
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1503
     chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1504
 
1504
 
1505
     shred -zu /home/$MY_USERNAME/gpg-genkey.conf
1505
     shred -zu /home/$MY_USERNAME/gpg-genkey.conf
1614
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1614
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1615
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
1615
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
1616
         echo $'Generating a new GPG key'
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
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1618
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
1619
         KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
1619
         KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_EMAIL_ADDRESS")
1620
         if [[ $KEY_EXISTS == "no" ]]; then
1620
         if [[ $KEY_EXISTS == "no" ]]; then

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

72
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
72
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
73
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
73
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
74
         echo $'Backup key does not exist. Creating it.'
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
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
76
         chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
77
 
77
 
78
         shred -zu /home/$MY_USERNAME/gpg-genkey.conf
78
         shred -zu /home/$MY_USERNAME/gpg-genkey.conf