diff options
| author | jkim <jkim@FreeBSD.org> | 2014-04-08 21:06:58 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-04-08 21:06:58 +0000 |
| commit | 89b378c4b34c70b60981e17ea385f14c9e285912 (patch) | |
| tree | 782ade2dc94388e4ddc56b20d9c7ccf578d61077 /crypto/openssl/crypto/evp | |
| parent | 808e531530813c805e5f01db2b51e22340fd77a6 (diff) | |
| download | FreeBSD-src-89b378c4b34c70b60981e17ea385f14c9e285912.zip FreeBSD-src-89b378c4b34c70b60981e17ea385f14c9e285912.tar.gz | |
Merge OpenSSL 1.0.1g.
Approved by: benl (maintainer)
Diffstat (limited to 'crypto/openssl/crypto/evp')
| -rw-r--r-- | crypto/openssl/crypto/evp/bio_b64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/evp/bio_b64.c b/crypto/openssl/crypto/evp/bio_b64.c index 72a2a67..ac6d441 100644 --- a/crypto/openssl/crypto/evp/bio_b64.c +++ b/crypto/openssl/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. */ |
