diff options
| author | Eric Young <eay@pobox.com> | 2014-04-02 19:50:33 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-04-02 19:57:06 +0100 |
| commit | 0bb37c5e235a6bfdf916433107f6a2ba865595f4 (patch) | |
| tree | 2cf8785120467298453ef6e7226fa4c03f54b0a1 | |
| parent | e9b4b8afbd129adc18d3fe71ca2ab34fe61d8640 (diff) | |
| download | openssl-new-0bb37c5e235a6bfdf916433107f6a2ba865595f4.tar.gz | |
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)
| -rw-r--r-- | crypto/evp/bio_b64.c | 2 |
1 files changed, 1 insertions, 1 deletions
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. */ |