From 2283f5e85dbc78dd10810cb6ebfa39e61ab6759e Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Wed, 6 May 2015 09:49:30 -0400
Subject: Unapplying patches to prevent spurious conflicts.

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

(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 16863fe2..72a2a672 100755
--- a/Cryptlib/OpenSSL/crypto/evp/bio_b64.c
+++ b/Cryptlib/OpenSSL/crypto/evp/bio_b64.c
@@ -226,7 +226,6 @@ 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;
@@ -265,7 +264,7 @@ static int b64_read(BIO *b, char *out, int outl)
 				}
 
 			/* we fell off the end without starting */
-			if ((j == i) && (num == 0))
+			if (j == i)
 				{
 				/* Is this is one long chunk?, if so, keep on
 				 * reading until a new line. */
-- 
cgit v1.2.3