From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Mon, 11 May 2020 15:15:40 +0000 (+0200)
Subject: Replace misleading error message when loading PEM
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3ee36aa18253108a4aac304adfa19707edf56d50;p=oweals%2Fopenssl.git

Replace misleading error message when loading PEM

The error message "short header" when the end line
of PEM data cannot be identified is misleading.
Replace it with already existing "bad end line" error.

Fixes #8815

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/11793)

(cherry picked from commit f523ca66612e6712f287aa4b4ed722a5f2d4d960)
---

diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 0d79f4aea0..093ba09aeb 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -809,7 +809,7 @@ static int get_header_and_data(BIO *bp, BIO **header, BIO **data, char *name,
         flags_mask = ~0u;
         len = BIO_gets(bp, linebuf, LINESIZE);
         if (len <= 0) {
-            PEMerr(PEM_F_GET_HEADER_AND_DATA, PEM_R_SHORT_HEADER);
+            PEMerr(PEM_F_GET_HEADER_AND_DATA, PEM_R_BAD_END_LINE);
             goto err;
         }