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/pkcs7/pk7_smime.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Cryptlib/OpenSSL/crypto/pkcs7')

diff --git a/Cryptlib/OpenSSL/crypto/pkcs7/pk7_smime.c b/Cryptlib/OpenSSL/crypto/pkcs7/pk7_smime.c
index 49b450da..b0ff89aa 100755
--- a/Cryptlib/OpenSSL/crypto/pkcs7/pk7_smime.c
+++ b/Cryptlib/OpenSSL/crypto/pkcs7/pk7_smime.c
@@ -290,8 +290,8 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
 
 	bufsiz = 4096;
 	buf = OPENSSL_malloc (bufsiz);
-		if (buf == NULL) {
-			goto err;
+	if (buf == NULL) {
+		goto err;
 	}
 
 	/* We now have to 'read' from p7bio to calculate digests etc. */
-- 
cgit v1.2.3