Changeset 3820:32103d4e01f0

Timestamp:

2005-01-27 10:24:10 (4 years ago)

Author:

Marco d'Itri <md@…>

Branch:

HEAD

Message:

Evaluate gpg's machine-parseable status messages.

Files:

• contrib/gpg.rc (modified) (2 diffs)
• pgp.c (modified) (1 diff)

contrib/gpg.rc

@@ -32 +32 @@
 
 # decode application/pgp
-set pgp_decode_command="/usr/bin/gpg  --charset utf-8   %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
+set pgp_decode_command="/usr/bin/gpg  --charset utf-8   --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
 
 # verify a pgp/mime signature
-set pgp_verify_command="/usr/bin/gpg   --no-verbose --quiet  --batch  --output - --verify %s %f"
+set pgp_verify_command="/usr/bin/gpg   --status-fd=2 --no-verbose --quiet  --batch  --output - --verify %s %f"
 
 # decrypt a pgp/mime attachment
-set pgp_decrypt_command="/usr/bin/gpg   --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
+set pgp_decrypt_command="/usr/bin/gpg   --status-fd=2 --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
 
 # create a pgp/mime signed attachment
@@ -79 +79 @@
 
 # OK, here's a version which uses gnupg's message catalog:
-set pgp_good_sign="`gettext -d gnupg -s 'Good signature from "' | tr -d '"'`"
+# set pgp_good_sign="`gettext -d gnupg -s 'Good signature from "' | tr -d '"'`"
 
+# This version uses --status-fd messages
+set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"
+

pgp.c

@@ -152 +152 @@
                     line));
       
+      if (strncmp (line, "[GNUPG:] ", 9) == 0)
+        continue;
       fputs (line, fpout);
       fputc ('\n', fpout);