From dc7e01e7cd331b324a427019f25012bc4a0a0776 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 11 Mar 2014 22:37:57 +0000
Subject: [PATCH] Improving Mutt PGP

---
 beaglebone.txt | 74 ++++----------------------------------------------
 1 file changed, 5 insertions(+), 69 deletions(-)

diff --git a/beaglebone.txt b/beaglebone.txt
index 7ce8d62c..a2ceaf3f 100644
--- a/beaglebone.txt
+++ b/beaglebone.txt
@@ -2029,8 +2029,7 @@ bind pager \Cn sidebar-next
 bind pager \Co sidebar-open
 
 # ctrl-b toggles sidebar visibility
-macro index \Cb '<enter-command>toggle sidebar_visible<enter><refresh>' "toggle sidebar"
-macro pager \Cb '<enter-command>toggle sidebar_visible<enter><redraw-screen>' "toggle sidebar"
+macro index,pager \Cb '<enter-command>toggle sidebar_visible<enter><redraw-screen>' "toggle sidebar"
 
 # esc-m Mark new messages as read
 macro index <esc>m "T~N<enter>;WNT~O<enter>;WO\CT~T<enter>" "mark all messages read"
@@ -2038,76 +2037,13 @@ macro index <esc>m "T~N<enter>;WNT~O<enter>;WO\CT~T<enter>" "mark all messages r
 
 # GPG/PGP integration
 
-# decode application/pgp
-set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-
-# verify a pgp/mime signature
-set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
-
-# decrypt a pgp/mime attachment
-set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
-
-# create a pgp/mime signed attachment
-# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_sign_command="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="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--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="/usr/lib/mutt/pgpewrap gpg --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 %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-set pgp_encrypt_sign_command="/usr/lib/mutt/pgpewrap 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
-set pgp_import_command="gpg --no-verbose --import %f"
-
-# export a key from the public key ring
-set pgp_export_command="gpg --no-verbose --export --armor %r"
-
-# verify a key
-set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r"
-
-# read in the public key ring
-set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r"
-
-# read in the secret key ring
-set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r"
-
-# fetch keys
-# set pgp_getkeys_command="pkspxycwrap %r"
-# This will work when #172960 will be fixed upstream
-# set pgp_getkeys_command="gpg --recv-keys %r"
-
-# pattern for good signature - may need to be adapted to locale!
-
-# set pgp_good_sign="^gpgv?: 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 '"'`"
-
-# This version uses --status-fd messages
-set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"
-
 # this set the number of seconds to keep in memory the passphrase used to encrypt/sign
 set pgp_timeout=60
 
-
-# ctrl-i imports a PGP public key
-macro index \Ci pgp_import_command "Import PGP public key"
-macro pager \Ci pgp_import_command "Import PGP public key"
-
-# ctrl-e PGP encrypt a message
-macro index \Ce pgp_encrypt_sign_command "PGP encrypt"
-macro pager \Ce pgp_encrypt_sign_command "PGP encrypt"
-
-# ctrl-d PGP decrypt a message
-macro index \Cd pgp_decrypt_command "PGP decrypt"
-macro pager \Cd pgp_decrypt_command "PGP decrypt"
+# automatically sign and encrypt
+set pgp_autosign         # autosign all outgoing mails
+set pgp_replyencrypt     # autocrypt replies to crypted
+set pgp_replysign        # autosign replies to signed
 #+END_SRC
 
 Save and exit.