diff options
| author | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-05-10 10:03:20 -0400 |
|---|---|---|
| committer | Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2015-05-10 10:03:20 -0400 |
| commit | 86a08c30b489047d29cd84188c30fe2bc13ff1e9 (patch) | |
| tree | ecfef5f1808b45a6e28b6524d70a3b24d40170fd /Cryptlib/OpenSSL/crypto/conf | |
| parent | 37358ddb1cdda9a677d34f0635113bf2d542e025 (diff) | |
| download | efi-boot-shim-86a08c30b489047d29cd84188c30fe2bc13ff1e9.tar.gz efi-boot-shim-86a08c30b489047d29cd84188c30fe2bc13ff1e9.zip | |
Reapplying all patches
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/conf')
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/conf/conf_def.c | 2 | ||||
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/conf/conf_lib.c | 2 | ||||
| -rw-r--r-- | Cryptlib/OpenSSL/crypto/conf/conf_sap.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_def.c b/Cryptlib/OpenSSL/crypto/conf/conf_def.c index a168339b..ede10689 100644 --- a/Cryptlib/OpenSSL/crypto/conf/conf_def.c +++ b/Cryptlib/OpenSSL/crypto/conf/conf_def.c @@ -186,11 +186,13 @@ 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) { if (ERR_GET_REASON(ERR_peek_last_error()) == BIO_R_NO_SUCH_FILE) diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_lib.c b/Cryptlib/OpenSSL/crypto/conf/conf_lib.c index 2a3399d2..7f54d3d8 100644 --- a/Cryptlib/OpenSSL/crypto/conf/conf_lib.c +++ b/Cryptlib/OpenSSL/crypto/conf/conf_lib.c @@ -92,11 +92,13 @@ 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) { CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB); diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_sap.c b/Cryptlib/OpenSSL/crypto/conf/conf_sap.c index 760dc263..35f4a272 100644 --- 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); } |