2 files changed, 2 insertions, 4 deletions

diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index 945262f019..5938330d45 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -465,12 +465,11 @@ 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) {
                 PEMerr(PEM_F_PEM_DO_HEADER, PEM_R_BAD_DECRYPT);
                 return (0);
         }
-        *plen = j;
+        *plen = j + i;
         return (1);
 }
 
diff --git a/src/lib/libssl/src/crypto/pem/pem_lib.c b/src/lib/libssl/src/crypto/pem/pem_lib.c
index 945262f019..5938330d45 100644
--- a/src/lib/libssl/src/crypto/pem/pem_lib.c
+++ b/src/lib/libssl/src/crypto/pem/pem_lib.c
@@ -465,12 +465,11 @@ 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) {
                 PEMerr(PEM_F_PEM_DO_HEADER, PEM_R_BAD_DECRYPT);
                 return (0);
         }
-        *plen = j;
+        *plen = j + i;
         return (1);
 }