From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 30 Jun 2016 22:14:34 +0000 (+0300)
Subject: lib-dcrypt: Removed dead code.
X-Git-Tag: 2.2.26~513
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93fa374e8b7e63ff813b29d4db8b4a0847164ceb;p=thirdparty%2Fdovecot%2Fcore.git

lib-dcrypt: Removed dead code.
---

diff --git a/src/lib-dcrypt/ostream-encrypt.c b/src/lib-dcrypt/ostream-encrypt.c
index d5c20a728d..a18fc2bc38 100644
--- a/src/lib-dcrypt/ostream-encrypt.c
+++ b/src/lib-dcrypt/ostream-encrypt.c
@@ -203,18 +203,11 @@ int o_stream_encrypt_keydata_create_v1(struct encrypt_ostream *stream)
 		return -1;
 	}
 
-	if (ec == 0) {
-		/* same as above */
-		dcrypt_ctx_sym_set_iv(stream->ctx_sym, (const unsigned char*)"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16);
-		dcrypt_ctx_sym_set_key(stream->ctx_sym, seed, sizeof(seed));
-	}
+	/* same as above */
+	dcrypt_ctx_sym_set_iv(stream->ctx_sym, (const unsigned char*)"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", 16);
+	dcrypt_ctx_sym_set_key(stream->ctx_sym, seed, sizeof(seed));
 	safe_memset(seed, 0, sizeof(seed));
 
-	if (ec != 0) {
-		io_stream_set_error(&stream->ostream.iostream, "Encryption init error: %s", error);
-		return -1;
-	}
-
 	if (!dcrypt_ctx_sym_init(stream->ctx_sym, &error)) {
 		io_stream_set_error(&stream->ostream.iostream, "Encryption init error: %s", error);
 		return -1;