projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
begin to work on a lib-mime that will hold most of the MIME related stuff.
[apps/madmutt.git]
/
contrib
/
gpg.rc
diff --git
a/contrib/gpg.rc
b/contrib/gpg.rc
index
8b567ef
..
ca726c1
100644
(file)
--- a/
contrib/gpg.rc
+++ b/
contrib/gpg.rc
@@
-3,9
+3,9
@@
# Command formats for gpg.
#
# This version uses gpg-2comp from
# Command formats for gpg.
#
# This version uses gpg-2comp from
-# http://
muppet.faveve.uni-stuttgart.de/~gero
/gpg-2comp.tar.gz
+# http://
70t.de/download
/gpg-2comp.tar.gz
#
#
-# $Id: gpg.rc,v 3.
1 2002/03/26 22:23:58
roessler Exp $
+# $Id: gpg.rc,v 3.
4 2005/01/27 18:27:36
roessler Exp $
#
# %p The empty string when no passphrase is needed,
# the string "PGPPASSFD=0" if one is needed.
#
# %p The empty string when no passphrase is needed,
# the string "PGPPASSFD=0" if one is needed.
@@
-31,32
+31,32
@@
# breaking PGP/MIME.
# decode application/pgp
# breaking PGP/MIME.
# 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
--status-fd=2
%?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
# verify a pgp/mime signature
# 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
# 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 %?p?--passphrase-fd 0?
--no-verbose --quiet --batch --output - %f"
# create a pgp/mime signed attachment
# set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
# create a pgp/mime signed attachment
# 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 --no-verbose --batch --quiet --output -
--passphrase-fd 0
--armor --detach-sign --textmode %?a?-u %a? %f"
+set pgp_sign_command="/usr/bin/gpg --no-verbose --batch --quiet --output -
%?p?--passphrase-fd 0?
--armor --detach-sign --textmode %?a?-u %a? %f"
# create a application/pgp signed (old-style) message
# set pgp_clearsign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
# create a application/pgp signed (old-style) message
# 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
--charset utf-8 --no-verbose --batch --quiet --output - --passphrase-fd 0
--armor --textmode --clearsign %?a?-u %a? %f"
+set pgp_clearsign_command="/usr/bin/gpg
--no-verbose --batch --quiet --output - %?p?--passphrase-fd 0?
--armor --textmode --clearsign %?a?-u %a? %f"
# create a pgp/mime encrypted attachment
# 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
/usr/bin/gpg --charset utf-8
--batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+# set pgp_encrypt_only_command="pgpewrap
ng
gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_only_command="pgpewrap
ng /usr/bin/gpg
--batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
# create a pgp/mime encrypted and signed attachment
# 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
/usr/bin/gpg --charset utf-8 --passphrase-fd 0
--batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+# set pgp_encrypt_sign_command="pgpewrap
ng
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
ng /usr/bin/gpg %?p?--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
# import a key into the public key ring
-set pgp_import_command="/usr/bin/gpg --no-verbose --import
-v
%f"
+set pgp_import_command="/usr/bin/gpg --no-verbose --import %f"
# export a key from the public key ring
set pgp_export_command="/usr/bin/gpg --no-verbose --export --armor %r"
# export a key from the public key ring
set pgp_export_command="/usr/bin/gpg --no-verbose --export --armor %r"
@@
-78,5
+78,8
@@
set pgp_list_secring_command="/usr/bin/gpg --no-verbose --batch --quiet --wi
# set pgp_good_sign="^gpg: Good signature from"
# OK, here's a version which uses gnupg's message catalog:
# set pgp_good_sign="^gpg: Good signature from"
# 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"