GPGME: do not attempt to extract signatures unless gpgme_op_verify returned success.

diff --git a/ChangeLog b/ChangeLog
index 68536b13d255bb5d86148f1f23f94ceac2e6e540..e53034c840879947e52a4c439749f77c48eaf06b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2007-07-09 11:32 -0400  Aron Griffis  <agriffis@n01se.net>  (4e8e3db418ea)
+
+       * send.c: Allow send-hooks to effectively change $from and $use_from
+
+2007-07-09 09:45 -0400  Aron Griffis  <agriffis@n01se.net>  (82354e0d2399)
+
+       * mx.c: Clean up mx.c: init stat structs to zero
+
+       prev_sb.st_size was initialized to zero if USE_FCNTL but not if
+       USE_FLOCK. Silence the gcc warning for both cases by zeroing the
+       stat structures on the stack.
+
+       Other minor cleanups:
+       - clean up some whitespace
+       - convert return (foo) to return foo
+       - return r at the bottom of the function instead of testing values and
+       returning them explicitly
+       - add vim modeline
+
+2007-07-10 14:47 +0200  Thomas Roessler  <roessler@does-not-exist.org>  (c06e39893cce)
+
+       * handler.c: Actually bail out, but wiht an ok return value.
+
+       * handler.c: Don't bail out on a bad message/external-body!
+
+2007-07-08 18:27 -0700  David Champion  <dgc@uchicago.edu>  (6241f5669264)
+
+       * commands.c, curs_lib.c, doc/manual.xml.head, init.h, lib.h, menu.c,
+       muttlib.c, query.c, recvcmd.c: This patch implements the "%* "
+       notation, which is analogous to "%> " but gives precedence to the
+       right side instead of to the left when the fill length is zero. The
+       default $pager_format is updated to use it so that %P is always
+       available at the edge of the screen.
+
+2007-07-08 15:34 -0700  Edmund GRIMLEY EVANS  <edmund820@rano.org>  (5d74a79deeb3)
+
+       * po/eo.po: Updated Esperanto translation.
+
 2007-07-04 17:36 -0700  Brendan Cully  <brendan@kublai.com>  (f24fa301493f)
 
        * crypt-gpgme.c: Fix some compiler warnings in GPGME. Closes #2919.

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 4469aa22204c1ad6bb7549edf6a00ba72578c8dd..3809daab4086e6656cf430d7d0f19ea6287c8b8c 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -1551,8 +1551,9 @@ static BODY *decrypt_part (BODY *a, STATE *s, FILE *fpout, int is_smime,
       else if (maybe_signed)
        err = gpgme_op_verify (ctx, ciphertext, NULL, plaintext);
 
+      if (err == GPG_ERR_NO_ERROR)
       {
-       /* Check wether signatures have been verified.  */
+       /* Check whether signatures have been verified.  */
        gpgme_verify_result_t verify_result = gpgme_op_verify_result (ctx);
        if (verify_result->signatures)
          sig_stat = 1;