summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorThomas Roessler <roessler@does-not-exist.org>2001-07-29 09:48:04 +0000
committerThomas Roessler <roessler@does-not-exist.org>2001-07-29 09:48:04 +0000
commitdf41fa8061d588bb37f510070e88eaee3ed03223 (patch)
tree6ccd7d15e4fcba878b9d4e5fdbd5e843cdd03dca /contrib
parent536f5b7ef72395f9ef4c1cc33d4d9718a2927d8a (diff)
Fix the comment header, and generally be less verbose.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gpg.rc45
1 files changed, 26 insertions, 19 deletions
diff --git a/contrib/gpg.rc b/contrib/gpg.rc
index e00eaa7b..82835afb 100644
--- a/contrib/gpg.rc
+++ b/contrib/gpg.rc
@@ -26,46 +26,53 @@
# %r In many contexts, mutt passes key IDs to pgp. %r expands to
# a list of key IDs.
+# Note that we explicitly set the comment armor header since GnuPG, when used
+# in some localiaztion environments, generates 8bit data in that header, thereby
+# breaking PGP/MIME.
+
# decode application/pgp
-set pgp_decode_command="gpg %?p?--passphrase-fd 0? --no-verbose --batch --output - %f"
+set pgp_decode_command="/usr/bin/gpg --comment '-' %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
# verify a pgp/mime signature
-set pgp_verify_command="gpg --no-verbose --batch --output - --verify %s %f"
+set pgp_verify_command="/usr/bin/gpg --comment '-' --no-verbose --quiet --batch --output - --verify %s %f"
# decrypt a pgp/mime attachment
-set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --batch --output - %f"
+set pgp_decrypt_command="/usr/bin/gpg --comment '-' --passphrase-fd 0 --no-verbose --quiet --batch --output - %f"
# create a pgp/mime signed attachment
-# set pgp_sign_command="gpg-2comp --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_sign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
+# set pgp_sign_command="/usr/bin/gpg-2comp --comment '-' --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
+set pgp_sign_command="/usr/bin/gpg --comment '-' --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
# create a application/pgp signed (old-style) message
-# set pgp_clearsign_command="gpg-2comp --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_clearsign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
+# set pgp_clearsign_command="/usr/bin/gpg-2comp --comment '-' --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
+set pgp_clearsign_command="/usr/bin/gpg --comment '-' --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
# create a pgp/mime encrypted attachment
-# set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-set pgp_encrypt_only_command="pgpewrap gpg -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+# set pgp_encrypt_only_command="pgpewrap gpg-2comp --comment '-' -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg --comment '-' --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
# create a pgp/mime encrypted and signed attachment
-# set pgp_encrypt_sign_command="pgpewrap gpg-2comp --passphrase-fd 0 -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-set pgp_encrypt_sign_command="pgpewrap gpg --passphrase-fd 0 -v --batch --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+# set pgp_encrypt_sign_command="pgpewrap gpg-2comp --comment '-' --passphrase-fd 0 -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg --comment '-' --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
# import a key into the public key ring
-set pgp_import_command="gpg --no-verbose --import -v %f"
+set pgp_import_command="/usr/bin/gpg --comment '-' --no-verbose --import -v %f"
# export a key from the public key ring
-set pgp_export_command="gpg --no-verbose --export --armor %r"
+set pgp_export_command="/usr/bin/gpg --comment '-' --no-verbose --export --armor %r"
# verify a key
-set pgp_verify_key_command="gpg --no-verbose --batch --fingerprint --check-sigs %r"
+set pgp_verify_key_command="/usr/bin/gpg --comment '-' --verbose --batch --fingerprint --check-sigs %r"
# read in the public key ring
-set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r"
+set pgp_list_pubring_command="/usr/bin/gpg --comment '-' --no-verbose --batch --quiet --with-colons --list-keys %r"
# read in the secret key ring
-set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r"
+set pgp_list_secring_command="/usr/bin/gpg --comment '-' --no-verbose --batch --quiet --with-colons --list-secret-keys %r"
+
+# fetch keys
+# set pgp_getkeys_command="pkspxycwrap %r"
+
+# pattern for good signature - may need to be adapted to locale!
+set pgp_good_sign="^gpg: Good signature from"
-# receive key from keyserver:
-#set pgp_getkeys_command="wrap.sh -g %r"
-set pgp_getkeys_command=""