From 172647da18bb3017f2a532b86d8083559081e017 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Tue, 7 Oct 2014 09:40:06 -0700
Subject: Restore debian/patches/prototypes, which still is needed on shim 0.7
 but only detected on the buildds.

---
 Cryptlib/OpenSSL/crypto/conf/conf_def.c | 2 ++
 Cryptlib/OpenSSL/crypto/conf/conf_lib.c | 2 ++
 Cryptlib/OpenSSL/crypto/conf/conf_sap.c | 2 ++
 3 files changed, 6 insertions(+)
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/conf/conf_def.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/conf/conf_lib.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/conf/conf_sap.c

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

diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_def.c b/Cryptlib/OpenSSL/crypto/conf/conf_def.c
old mode 100755
new mode 100644
index 3c58936d..f6082fbc
--- a/Cryptlib/OpenSSL/crypto/conf/conf_def.c
+++ b/Cryptlib/OpenSSL/crypto/conf/conf_def.c
@@ -186,10 +186,12 @@ static int def_load(CONF *conf, const char *name, long *line)
 	int ret;
 	BIO *in=NULL;
 
+#ifndef OPENSSL_NO_STDIO
 #ifdef OPENSSL_SYS_VMS
 	in=BIO_new_file(name, "r");
 #else
 	in=BIO_new_file(name, "rb");
+#endif
 #endif
 	if (in == NULL)
 		{
diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_lib.c b/Cryptlib/OpenSSL/crypto/conf/conf_lib.c
old mode 100755
new mode 100644
index 2a3399d2..7f54d3d8
--- a/Cryptlib/OpenSSL/crypto/conf/conf_lib.c
+++ b/Cryptlib/OpenSSL/crypto/conf/conf_lib.c
@@ -92,10 +92,12 @@ LHASH *CONF_load(LHASH *conf, const char *file, long *eline)
 	LHASH *ltmp;
 	BIO *in=NULL;
 
+#ifndef OPENSSL_NO_STDIO
 #ifdef OPENSSL_SYS_VMS
 	in=BIO_new_file(file, "r");
 #else
 	in=BIO_new_file(file, "rb");
+#endif
 #endif
 	if (in == NULL)
 		{
diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_sap.c b/Cryptlib/OpenSSL/crypto/conf/conf_sap.c
old mode 100755
new mode 100644
index 760dc263..35f4a272
--- a/Cryptlib/OpenSSL/crypto/conf/conf_sap.c
+++ b/Cryptlib/OpenSSL/crypto/conf/conf_sap.c
@@ -93,12 +93,14 @@ void OPENSSL_config(const char *config_name)
 		{
 		BIO *bio_err;
 		ERR_load_crypto_strings();
+#ifndef OPENSSL_NO_STDIO
 		if ((bio_err=BIO_new_fp(stderr, BIO_NOCLOSE)) != NULL)
 			{
 			BIO_printf(bio_err,"Auto configuration failed\n");
 			ERR_print_errors(bio_err);
 			BIO_free(bio_err);
 			}
+#endif
 		exit(1);
 		}
 
-- 
cgit v1.2.3