Changeset 396dc2c

Timestamp:

Feb 1, 2019, 8:12:49 PM (5 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

238c3a5

Parents:

9e596f5

git-author:

Anders Kaseorg <andersk@mit.edu> (02/01/19 19:58:44)

git-committer:

Anders Kaseorg <andersk@mit.edu> (02/01/19 20:12:49)

Message:

zcrypt: Try gpg1 before gpg

gpg2 insists on trying to do dumb things like starting gpg-agent and
making sockets in the home directory even when we’re doing symmetric
encryption, so let’s try to use gpg1 first if it’s available.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• zcrypt.c (modified) (4 diffs)

zcrypt.c

@@ -790 +790 @@
   char *out;
   int err, status;
+  int tried_gpg1 = FALSE;
   const char *argv[] = {
-    "gpg",
+    "gpg1",
     "--symmetric",
     "--no-options",
@@ -805 +806 @@
     NULL
   };
-  err = call_filter(argv, in, &out, &status);
+  while ((err = call_filter(argv, in, &out, &status)) && !out && !tried_gpg1) {
+    tried_gpg1 = TRUE;
+    argv[0] = "gpg";
+  }
   if(err || status) {
     g_free(out);
@@ -874 +878 @@
   char *in, *out;
   int length;
+  int tried_gpg1 = FALSE;
   const char *argv[] = {
-    "gpg",
+    "gpg1",
     "--decrypt",
     "--no-options",
@@ -892 +897 @@
   if(!in) return FALSE;
 
-  err = call_filter(argv, in, &out, &status);
+  while ((err = call_filter(argv, in, &out, &status)) && !out && !tried_gpg1) {
+    tried_gpg1 = TRUE;
+    argv[0] = "gpg";
+  }
   free(in);
   if(err || status) {