From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Sun, 5 Jun 2016 12:57:48 +0000 (+0300)
Subject: lib-dcrypt: Fixed error handling in dcrypt_key_id_public()
X-Git-Tag: 2.3.0.rc1~3551
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=759edc211f67e3bb1a6c0600014e3ac6b58561ca;p=thirdparty%2Fdovecot%2Fcore.git

lib-dcrypt: Fixed error handling in dcrypt_key_id_public()
---

diff --git a/src/lib-dcrypt/dcrypt-openssl.c b/src/lib-dcrypt/dcrypt-openssl.c
index 24dff266cd..797214026f 100644
--- a/src/lib-dcrypt/dcrypt-openssl.c
+++ b/src/lib-dcrypt/dcrypt-openssl.c
@@ -1920,7 +1920,7 @@ bool dcrypt_openssl_public_key_id(struct dcrypt_public_key *key, const char *alg
 	unsigned char buf[EVP_MD_size(md)];
 	EVP_PKEY *pub = (EVP_PKEY*)key;
 	const char *ptr;
-	int ec;
+	bool res;
 	if (pub == NULL) {
 		if (error_r != NULL)
 			*error_r = "key is NULL";
@@ -1945,10 +1945,10 @@ bool dcrypt_openssl_public_key_id(struct dcrypt_public_key *key, const char *alg
 	if (EVP_DigestInit_ex(ctx, md, NULL) < 1 ||
 	    EVP_DigestUpdate(ctx, (const unsigned char*)ptr, len) < 1 ||
 	    EVP_DigestFinal_ex(ctx, buf, &hlen) < 1) {
-		ec = dcrypt_openssl_error(error_r);
+		res = dcrypt_openssl_error(error_r);
 	} else {
 		buffer_append(result, buf, hlen);
-		ec = 0;
+		res = TRUE;
 	}
 
 #if SSLEAY_VERSION_NUMBER >= 0x1010000fL
@@ -1958,7 +1958,7 @@ bool dcrypt_openssl_public_key_id(struct dcrypt_public_key *key, const char *alg
 #endif
 	BIO_vfree(b);
 
-	return ec == 0;
+	return res;
 }
 
 static struct dcrypt_vfs dcrypt_openssl_vfs = {