Hi,

here is my first set of patches to cleanup some bit rot in the gpgme
interface of Mutt.  The actual visible thing is a fix to the listing of
imported keys.  That listing of imported keys to the console must have
stopped working on 2014-12-31 due to a fix for bug #3698, which was
needed due to a not fully working stub code introduced in 2008.

The patches now require GPGME 1.4.0 which was released more than 5 years
ago.  I don't thing that this should be any problem, in fact for
security reason it would even be better to require a very decent
version.  But that can be done later.

Some brief remarks:

  Nuke trailing white space from the crypt-* files.

Well, this is kind of optional but I don't really like changes in white
spaces and in particular trailing white spaces.  They clutter up all
diff output.

  Require GPGME version 1.2.0 and drop useless HAVE macros.

This removes HAVE_foo macros related to GPGME which are not actually
used.  1.2.0 was released 9 years ago.

  Always use the gpgme_new wrapper in crypt-gpgme.

This makes the code more readable.

  Try to avoid creation of temp. directory for key import.

Since gpgme 1.9 it is possible to list keys directly without importing
them to a the keyring.  If Mutt is build with at least gpgme 1.9.0 this
new feature is used.

  Improve the console output for extract-keys and speed up import.

The actual change.  This also fixed a bug in the real import code which
listed _all_ keys in the keyring to a temporary file and copied that one
to stdout.  The former commit avoided the output to stdout.  So
importing keys will be much faster if you have a large keyring.


Salam-Shalom,

   Werner


Werner Koch (5):
  Nuke trailing white space from the crypt-* files.
  Require GPGME version 1.2.0 and drop useless HAVE macros.
  Always use the gpgme_new wrapper in crypt-gpgme.
  Try to avoid creation of temp. directory for key import.
  Improve the console output for extract-keys and speed up import.

 configure.ac              |  14 +-
 crypt-gpgme.c             | 776 ++++++++++++++++++++++++++++++----------------
 crypt-gpgme.h             |   6 +-
 crypt-mod-pgp-classic.c   |  10 +-
 crypt-mod-pgp-gpgme.c     |  14 +-
 crypt-mod-smime-classic.c |  10 +-
 crypt-mod-smime-gpgme.c   |  10 +-
 crypt-mod.c               |   4 +-
 crypt-mod.h               |  14 +-
 crypt.c                   |  96 +++---
 cryptglue.c               |  18 +-
 11 files changed, 605 insertions(+), 367 deletions(-)

--
2.11.0

Reply via email to