[git] GnuPG - branch, master, updated. gnupg-2.1.10-32-g4ee881b

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  4ee881bff4c8fdfa4b3b7a4b7afab611471e97f1 (commit)
      from  7baca033070e7811f75e2021100adf8e6a48907f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4ee881bff4c8fdfa4b3b7a4b7afab611471e97f1
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Dec 15 12:38:25 2015 +0900

    sm: Handle gcry_pk_encrypt return value.
    
    * sm/encrypt.c (encrypt_dek): Don't ignore failure of gcry_pk_encrypt.
    
    --
    
    Thanks to Sami Farin.
    
    GnuPG-bug-id: 2154

diff --git a/sm/encrypt.c b/sm/encrypt.c
index 54a8bd1..c677a42 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -212,8 +212,11 @@ encrypt_dek (const DEK dek, ksba_cert_t cert, unsigned char **encval)
   gcry_sexp_release (s_pkey);
 
   /* Reformat it. */
-  rc = make_canon_sexp (s_ciph, encval, NULL);
-  gcry_sexp_release (s_ciph);
+  if (!rc)
+    {
+      rc = make_canon_sexp (s_ciph, encval, NULL);
+      gcry_sexp_release (s_ciph);
+    }
   return rc;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 sm/encrypt.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org