From 1e963007c0d9466726a8680e52a95955288d8927 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Tue, 7 Oct 2014 05:35:11 +0000
Subject: debian/patches/0001-Update-openssl-to-0.9.8za.patch: cherry-pick
 openssl 0.9.8za in via upstream.

---
 Cryptlib/OpenSSL/crypto/evp/bio_b64.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Cryptlib/OpenSSL/crypto/evp/bio_b64.c')

diff --git a/Cryptlib/OpenSSL/crypto/evp/bio_b64.c b/Cryptlib/OpenSSL/crypto/evp/bio_b64.c
index 72a2a672..16863fe2 100755
--- a/Cryptlib/OpenSSL/crypto/evp/bio_b64.c
+++ b/Cryptlib/OpenSSL/crypto/evp/bio_b64.c
@@ -226,6 +226,7 @@ static int b64_read(BIO *b, char *out, int outl)
 		else if (ctx->start)
 			{
 			q=p=(unsigned char *)ctx->tmp;
+			num = 0;
 			for (j=0; j<i; j++)
 				{
 				if (*(q++) != '\n') continue;
@@ -264,7 +265,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. */
-- 
cgit v1.2.3