From 5762c18517b206d71ecb70cd12dcea562d4efa76 Mon Sep 17 00:00:00 2001 From: Eric Young Date: Wed, 2 Apr 2014 19:50:33 +0100 Subject: [PATCH] Fix base64 decoding bug. A short PEM encoded sequence if passed to the BIO, and the file had 2 \n following would fail. PR#3289 (cherry picked from commit 10378fb5f4c67270b800e8f7c600cd0548874811) --- crypto/evp/bio_b64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/evp/bio_b64.c b/crypto/evp/bio_b64.c index 72a2a67277..ac6d441aad 100644 --- a/crypto/evp/bio_b64.c +++ b/crypto/evp/bio_b64.c @@ -264,7 +264,7 @@ static int b64_read(BIO *b, char *out, int outl) } /* we fell off the end without starting */ - if (j == i) + if ((j == i) && (num == 0)) { /* Is this is one long chunk?, if so, keep on * reading until a new line. */ -- 2.25.1