Mercurial > dovecot > core-2.2

changeset 20504:67459cf9699f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-dcrypt: istream-decrypt now differentiates between temporary errors and corruption.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Wed, 06 Jul 2016 13:15:22 +0300
parents e9faa5eec013
children 9144b6d4f5ca
files src/lib-dcrypt/istream-decrypt.c
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-dcrypt/istream-decrypt.c	Wed Jul 06 13:11:50 2016 +0300
+++ b/src/lib-dcrypt/istream-decrypt.c	Wed Jul 06 13:15:22 2016 +0300
@@ -114,6 +114,7 @@
 
 	if (i < 4) {
 		io_stream_set_error(&stream->istream.iostream, "Invalid or corrupted header");
+		stream->istream.istream.stream_errno = EINVAL;
 		return -1;
 	}
 
@@ -526,6 +527,7 @@
 		dcrypt_ctx_hmac_set_key(stream->ctx_mac, ptr, tagsize);
 		if (!dcrypt_ctx_hmac_init(stream->ctx_mac, &error)) {
 			io_stream_set_error(&stream->istream.iostream, "MAC error: %s", error);
+			stream->istream.istream.stream_errno = EINVAL;
 			failed = TRUE;
 		}
 		stream->ftr = dcrypt_ctx_hmac_get_digest_length(stream->ctx_mac);
@@ -555,6 +557,7 @@
 		return 0;
 	if (memcmp(data, IOSTREAM_CRYPT_MAGIC, sizeof(IOSTREAM_CRYPT_MAGIC)) != 0) {
 		io_stream_set_error(&stream->istream.iostream, "Invalid magic");
+		stream->istream.istream.stream_errno = EINVAL;
 		return -1;
 	}
 	data += sizeof(IOSTREAM_CRYPT_MAGIC);
@@ -594,6 +597,7 @@
 		return -1;
 	else if (ret == 0) {
 		io_stream_set_error(&stream->istream.iostream, "Decryption error: truncate header length");
+		stream->istream.istream.stream_errno = EINVAL;
 		return -1;
 	}
 	stream->initialized = TRUE;
@@ -704,8 +708,9 @@
 			ssize_t hret;
 			if ((hret=i_stream_decrypt_read_header
 				(dstream, data, size)) <= 0) {
-				if (hret < 0) {
-					stream->istream.stream_errno = EINVAL;
+				if (hret < 0 && stream->istream.stream_errno == 0) {
+					/* assume temporary failure */
+					stream->istream.stream_errno = EIO;
 				}
 				return hret;
 			}
@@ -851,7 +856,7 @@
 
 	if (ec != 0) {
 		io_stream_set_error(&dstream->istream.iostream, "Cannot initialize decryption: %s", error);
-		dstream->istream.istream.stream_errno = EINVAL;
+		dstream->istream.istream.stream_errno = EIO;
 	};
 
 	return &dstream->istream.istream;