summaryrefslogtreecommitdiffstats
path: root/crypto/evp/bio_b64.c
diff options
context:
space:
mode:
authorEric Young <eay@pobox.com>2014-04-02 19:50:33 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-04-02 19:54:27 +0100
commit10378fb5f4c67270b800e8f7c600cd0548874811 (patch)
tree3feeaaca1b89c62ab8e1d2273c65f65f80a28af1 /crypto/evp/bio_b64.c
parentb48310627d1fdc58f64ccf208ac82c732e654dca (diff)
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
Diffstat (limited to 'crypto/evp/bio_b64.c')
-rw-r--r--crypto/evp/bio_b64.c2
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. */