Просмотр исходного кода

Don't delete keys from USB drive

Bob Mottram 9 лет назад
Родитель
Сommit
0aa61984b0
1 измененных файлов: 3 добавлений и 13 удалений
  1. 3
    13
      src/freedombone

+ 3
- 13
src/freedombone Просмотреть файл

@@ -4616,14 +4616,9 @@ function search_for_attached_usb_drive {
4616 4616
               cp -r $USB_MOUNT/.gnupg /home/$MY_USERNAME
4617 4617
               chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.gnupg
4618 4618
               GPG_KEYS_IMPORTED="yes"
4619
-              if [ -f /home/$MY_USERNAME/.gnupg/secring.gpg ]; then
4620
-                  shred -zu $USB_MOUNT/.gnupg/secring.gpg
4621
-                  shred -zu $USB_MOUNT/.gnupg/random_seed
4622
-                  shred -zu $USB_MOUNT/.gnupg/trustdb.gpg
4623
-                  rm -rf $USB_MOUNT/.gnupg
4624
-              else
4619
+              if [ ! -f /home/$MY_USERNAME/.gnupg/secring.gpg ]; then
4625 4620
                   echo 'GPG files did not copy'
4626
-                  exit 7
4621
+                  exit 73529
4627 4622
               fi
4628 4623
           fi
4629 4624
 
@@ -4654,12 +4649,7 @@ function search_for_attached_usb_drive {
4654 4649
           cp -r $USB_MOUNT/.ssh /home/$MY_USERNAME
4655 4650
           chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.ssh
4656 4651
           # for security delete the ssh keys from the usb drive
4657
-          if [ -f /home/$MY_USERNAME/.ssh/id_rsa ]; then
4658
-              shred -zu $USB_MOUNT/.ssh/id_rsa
4659
-              shred -zu $USB_MOUNT/.ssh/id_rsa.pub
4660
-              shred -zu $USB_MOUNT/.ssh/known_hosts
4661
-              rm -rf $USB_MOUNT/.ssh
4662
-          else
4652
+          if [ ! -f /home/$MY_USERNAME/.ssh/id_rsa ]; then
4663 4653
               echo 'ssh files did not copy'
4664 4654
               exit 8
4665 4655
           fi