diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2015-09-11 14:56:32 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-09-29 21:59:19 -0400 |
| commit | 984d6c6052169bcae8010de33f7796e455536d61 (patch) | |
| tree | 0448e92cb3b120f8e685fa2d390007c57f13dee3 /crypto/x509 | |
| parent | 57ebe74831d9875dde98d5088bb78f5c89396d6b (diff) | |
| download | openssl-984d6c6052169bcae8010de33f7796e455536d61.tar.gz | |
Fix no-stdio build
Much related/similar work also done by
Ivan Nestlerode <ivan.nestlerode@sonos.com>
+Replace FILE BIO's with dummy ops that fail.
+Include <stdio.h> for sscanf() even with no-stdio (since the declaration
is there). We rely on sscanf() to parse the OPENSSL_ia32cap environment
variable, since it can be larger than a 'long'. And we don't rely on the
availability of strtoull().
+Remove OPENSSL_stderr(); not used.
+Make OPENSSL_showfatal() do nothing (currently without stdio there's
nothing we can do).
+Remove file-based functionality from ssl/. The function
prototypes were already gone, but not the functions themselves.
+Remove unviable conf functionality via SYS_UEFI
+Add fallback definition of BUFSIZ.
+Remove functions taking FILE * from header files.
+Add missing DECLARE_PEM_write_fp_const
+Disable X509_LOOKUP_hash_dir(). X509_LOOKUP_file() was already compiled out,
so remove its prototype.
+Use OPENSSL_showfatal() in CRYPTO_destroy_dynlockid().
+Eliminate SRP_VBASE_init() and supporting functions. Users will need to
build the verifier manually instead.
+Eliminate compiler warning for unused do_pk8pkey_fp().
+Disable TEST_ENG_OPENSSL_PKEY.
+Disable GOST engine as is uses [f]printf all over the place.
+Eliminate compiler warning for unused send_fp_chars().
Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/by_dir.c | 1 | ||||
| -rw-r--r-- | crypto/x509/by_file.c | 4 | ||||
| -rw-r--r-- | crypto/x509/x509_d2.c | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index 5241cad639..3dd04d04aa 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -69,6 +69,7 @@ # include <sys/stat.h> #endif + #include <openssl/lhash.h> #include <openssl/x509.h> #include "internal/x509_int.h" diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c index 6fbffe11c1..7983b1527e 100644 --- a/crypto/x509/by_file.c +++ b/crypto/x509/by_file.c @@ -66,8 +66,6 @@ #include <openssl/x509.h> #include <openssl/pem.h> -#ifndef OPENSSL_NO_STDIO - static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret); static X509_LOOKUP_METHOD x509_file_lookup = { @@ -269,5 +267,3 @@ int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type) sk_X509_INFO_pop_free(inf, X509_INFO_free); return count; } - -#endif /* OPENSSL_NO_STDIO */ diff --git a/crypto/x509/x509_d2.c b/crypto/x509/x509_d2.c index 29bbf50a2c..e3d08630b9 100644 --- a/crypto/x509/x509_d2.c +++ b/crypto/x509/x509_d2.c @@ -61,7 +61,6 @@ #include <openssl/crypto.h> #include <openssl/x509.h> -#ifndef OPENSSL_NO_STDIO int X509_STORE_set_default_paths(X509_STORE *ctx) { X509_LOOKUP *lookup; @@ -105,5 +104,3 @@ int X509_STORE_load_locations(X509_STORE *ctx, const char *file, return (0); return (1); } - -#endif |