diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2014-10-07 00:30:44 +0000 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2014-10-07 00:30:44 +0000 |
| commit | e34fca619d8a75f3b67d59d45cdd9db4da2342e6 (patch) | |
| tree | fab53b36b97b7f27f3ea2bf68370e8a8bf1dae1a /Cryptlib/OpenSSL/crypto | |
| parent | c61b06bc69b046c0e85b3e3cec684bd9aa17ff19 (diff) | |
| download | efi-boot-shim-e34fca619d8a75f3b67d59d45cdd9db4da2342e6.tar.gz efi-boot-shim-e34fca619d8a75f3b67d59d45cdd9db4da2342e6.zip | |
Drop prototypes patch, apparently not needed upstream
Diffstat (limited to 'Cryptlib/OpenSSL/crypto')
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/conf/conf_def.c | 2 | ||||
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/conf/conf_lib.c | 2 | ||||
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/conf/conf_sap.c | 2 | ||||
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/engine/eng_openssl.c | 4 | ||||
| -rwxr-xr-x | Cryptlib/OpenSSL/crypto/x509v3/v3_pci.c | 2 |
5 files changed, 0 insertions, 12 deletions
diff --git a/Cryptlib/OpenSSL/crypto/conf/conf_def.c b/Cryptlib/OpenSSL/crypto/conf/conf_def.c index f6082fbc..3c58936d 100755 --- a/Cryptlib/OpenSSL/crypto/conf/conf_def.c +++ b/Cryptlib/OpenSSL/crypto/conf/conf_def.c @@ -186,13 +186,11 @@ 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 7f54d3d8..2a3399d2 100755 --- a/Cryptlib/OpenSSL/crypto/conf/conf_lib.c +++ b/Cryptlib/OpenSSL/crypto/conf/conf_lib.c @@ -92,13 +92,11 @@ 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 35f4a272..760dc263 100755 --- a/Cryptlib/OpenSSL/crypto/conf/conf_sap.c +++ b/Cryptlib/OpenSSL/crypto/conf/conf_sap.c @@ -93,14 +93,12 @@ 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 index f1307039..7c139ae2 100755 --- a/Cryptlib/OpenSSL/crypto/engine/eng_openssl.c +++ b/Cryptlib/OpenSSL/crypto/engine/eng_openssl.c @@ -374,15 +374,11 @@ 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 index b6f5a612..823e9afc 100755 --- a/Cryptlib/OpenSSL/crypto/x509v3/v3_pci.c +++ b/Cryptlib/OpenSSL/crypto/x509v3/v3_pci.c @@ -157,7 +157,6 @@ 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]; @@ -195,7 +194,6 @@ 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); |
