Mercurial > dovecot > core-2.2

changeset 21246:7cb8a80dd5aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-dcrypt: Add error handling for dcrypt_key_id_private
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Mon, 28 Nov 2016 15:20:01 +0200
parents 4b89892b69f6
children 5af715500928
files src/lib-dcrypt/istream-decrypt.c
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-dcrypt/istream-decrypt.c	Mon Nov 28 15:17:55 2016 +0200
+++ b/src/lib-dcrypt/istream-decrypt.c	Mon Nov 28 15:20:01 2016 +0200
@@ -291,7 +291,13 @@
 			return -1;
 		}
 		buffer_create_from_data(&buf, dgst, sizeof(dgst));
-		dcrypt_key_id_private(stream->priv_key, "sha256", &buf, NULL);
+		if (!dcrypt_key_id_private(stream->priv_key, "sha256", &buf,
+					   &error)) {
+			io_stream_set_error(&stream->istream.iostream, "Decryption error: "
+								       "dcrypt_key_id_private failed: %s",
+								       error);
+			return -1;
+		}
 	}
 
 	/* for each key */