From: Ben Laurie <ben@links.org>
Date: Wed, 29 Jan 2014 16:57:32 +0000 (+0100)
Subject: Fix warning.
X-Git-Tag: OpenSSL_1_0_2-beta1~83
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7b2d785d2005e35982293094ccabb3e9385f17a9;p=oweals%2Fopenssl.git

Fix warning.
---

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 5e41d85a6a..2d328b4d36 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -480,8 +480,9 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
 	EVP_CIPHER_CTX_cleanup(&ctx);
 	OPENSSL_cleanse((char *)buf,sizeof(buf));
 	OPENSSL_cleanse((char *)key,sizeof(key));
-	j+=i;
-	if (!o)
+	if (o)
+		j+=i;
+	else
 		{
 		PEMerr(PEM_F_PEM_DO_HEADER,PEM_R_BAD_DECRYPT);
 		return(0);