Pārlūkot izejas kodu

Use curve 25519 for gpg keys

Bob Mottram 7 gadus atpakaļ
vecāks
revīzija
4d8592f7ab

+ 1
- 3
src/freedombone-adduser Parādīt failu

136
 chmod 600 /home/$ADD_USERNAME/.gnupg/*
136
 chmod 600 /home/$ADD_USERNAME/.gnupg/*
137
 
137
 
138
 # Generate a GPG key
138
 # Generate a GPG key
139
-echo 'Key-Type: 1' > /home/$ADD_USERNAME/gpg-genkey.conf
140
-echo 'Key-Length: 4096' >> /home/$ADD_USERNAME/gpg-genkey.conf
139
+echo 'Key-Type: 9' > /home/$ADD_USERNAME/gpg-genkey.conf
141
 echo 'Subkey-Type: 1' >> /home/$ADD_USERNAME/gpg-genkey.conf
140
 echo 'Subkey-Type: 1' >> /home/$ADD_USERNAME/gpg-genkey.conf
142
-echo 'Subkey-Length: 4096' >> /home/$ADD_USERNAME/gpg-genkey.conf
143
 echo "Name-Real:  $ADD_USERNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
141
 echo "Name-Real:  $ADD_USERNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
144
 echo "Name-Email: $ADD_USERNAME@$HOSTNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
142
 echo "Name-Email: $ADD_USERNAME@$HOSTNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
145
 echo 'Expire-Date: 0' >> /home/$ADD_USERNAME/gpg-genkey.conf
143
 echo 'Expire-Date: 0' >> /home/$ADD_USERNAME/gpg-genkey.conf

+ 2
- 5
src/freedombone-base-email Parādīt failu

1506
 
1506
 
1507
     # Generate a GPG subkey
1507
     # Generate a GPG subkey
1508
     # Here a 2048bit length is used to be compatible with yubikey
1508
     # Here a 2048bit length is used to be compatible with yubikey
1509
-    echo 'Key-Type: 1' > /home/$MY_USERNAME/gpg-genkey.conf
1509
+    echo 'Key-Type: 9' > /home/$MY_USERNAME/gpg-genkey.conf
1510
     echo "Key-Grip: $KEYGRIP" > /home/$MY_USERNAME/gpg-genkey.conf
1510
     echo "Key-Grip: $KEYGRIP" > /home/$MY_USERNAME/gpg-genkey.conf
1511
     echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
1511
     echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
1512
-    echo 'Subkey-Length: 2048' >> /home/$MY_USERNAME/gpg-genkey.conf
1513
     echo "subkey-Usage: $GPG_KEY_USAGE" > /home/$MY_USERNAME/gpg-genkey.conf
1512
     echo "subkey-Usage: $GPG_KEY_USAGE" > /home/$MY_USERNAME/gpg-genkey.conf
1514
     echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
1513
     echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
1515
     echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1514
     echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1624
         fi
1623
         fi
1625
     else
1624
     else
1626
         # Generate a GPG key
1625
         # Generate a GPG key
1627
-        echo 'Key-Type: 1' > /home/$MY_USERNAME/gpg-genkey.conf
1628
-        echo 'Key-Length: 4096' >> /home/$MY_USERNAME/gpg-genkey.conf
1626
+        echo 'Key-Type: 9' > /home/$MY_USERNAME/gpg-genkey.conf
1629
         echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
1627
         echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
1630
-        echo 'Subkey-Length: 4096' >> /home/$MY_USERNAME/gpg-genkey.conf
1631
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
1628
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
1632
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1629
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
1633
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
1630
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf

+ 1
- 3
src/freedombone-utils-backup Parādīt failu

65
     # Generate a GPG key for backups
65
     # Generate a GPG key for backups
66
     BACKUP_KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_NAME (backup key)")
66
     BACKUP_KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_NAME (backup key)")
67
     if [[ $BACKUP_KEY_EXISTS == "no" ]]; then
67
     if [[ $BACKUP_KEY_EXISTS == "no" ]]; then
68
-        echo 'Key-Type: 1' > /home/$MY_USERNAME/gpg-genkey.conf
69
-        echo 'Key-Length: 4096' >> /home/$MY_USERNAME/gpg-genkey.conf
68
+        echo 'Key-Type: 9' > /home/$MY_USERNAME/gpg-genkey.conf
70
         echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
69
         echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
71
-        echo 'Subkey-Length: 4096' >> /home/$MY_USERNAME/gpg-genkey.conf
72
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
70
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
73
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
71
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
74
         echo "Name-Comment: backup key" >> /home/$MY_USERNAME/gpg-genkey.conf
72
         echo "Name-Comment: backup key" >> /home/$MY_USERNAME/gpg-genkey.conf