aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2015-12-15 03:38:25 +0000
committerNIIBE Yutaka <[email protected]>2015-12-15 03:44:41 +0000
commitb508af2b2c40a715ef5ead4455b466954c2943ee (patch)
tree0e0ab9169aa90af03e7014b222b77280fa5ba7b6
parentscd: Fix commit 9a9bfd77. (diff)
downloadgnupg-b508af2b2c40a715ef5ead4455b466954c2943ee.tar.gz
gnupg-b508af2b2c40a715ef5ead4455b466954c2943ee.zip
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 (backport commit of 4ee881bff4c8fdfa4b3b7a4b7afab611471e97f1)
-rw-r--r--sm/encrypt.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sm/encrypt.c b/sm/encrypt.c
index 42a438a95..ab74fa21d 100644
--- a/sm/encrypt.c
+++ b/sm/encrypt.c
@@ -208,8 +208,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;
}