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 ++
 Cryptlib/OpenSSL/crypto/engine/eng_openssl.c | 4 ++++
 Cryptlib/OpenSSL/crypto/x509v3/v3_pci.c      | 2 ++
 5 files changed, 12 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
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/engine/eng_openssl.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/x509v3/v3_pci.c

(limited to 'Cryptlib/OpenSSL')

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);
 		}
 
diff --git a/Cryptlib/OpenSSL/crypto/engine/eng_openssl.c b/Cryptlib/OpenSSL/crypto/engine/eng_openssl.c
old mode 100755
new mode 100644
index 7c139ae2..f1307039
--- a/Cryptlib/OpenSSL/crypto/engine/eng_openssl.c
+++ b/Cryptlib/OpenSSL/crypto/engine/eng_openssl.c
@@ -374,11 +374,15 @@ static EVP_PKEY *openssl_load_privkey(ENGINE *eng, const char *key_id,
 	BIO *in;
 	EVP_PKEY *key;
 	fprintf(stderr, "(TEST_ENG_OPENSSL_PKEY)Loading Private key %s\n", key_id);
+#ifndef OPENSSL_NO_STDIO
 	in = BIO_new_file(key_id, "r");
 	if (!in)
 		return NULL;
 	key = PEM_read_bio_PrivateKey(in, NULL, 0, NULL);
 	BIO_free(in);
+#else
+	return NULL;
+#endif
 	return key;
 	}
 #endif
diff --git a/Cryptlib/OpenSSL/crypto/x509v3/v3_pci.c b/Cryptlib/OpenSSL/crypto/x509v3/v3_pci.c
old mode 100755
new mode 100644
index 823e9afc..b6f5a612
--- a/Cryptlib/OpenSSL/crypto/x509v3/v3_pci.c
+++ b/Cryptlib/OpenSSL/crypto/x509v3/v3_pci.c
@@ -157,6 +157,7 @@ static int process_pci_value(CONF_VALUE *val,
 				}
 			OPENSSL_free(tmp_data2);
 			}
+#ifndef OPENSSL_NO_STDIO
 		else if (strncmp(val->value, "file:", 5) == 0)
 			{
 			unsigned char buf[2048];
@@ -194,6 +195,7 @@ static int process_pci_value(CONF_VALUE *val,
 				goto err;
 				}
 			}
+#endif
 		else if (strncmp(val->value, "text:", 5) == 0)
 			{
 			val_len = strlen(val->value + 5);
-- 
cgit v1.2.3