From 984d6c6052169bcae8010de33f7796e455536d61 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 11 Sep 2015 14:56:32 -0400 Subject: Fix no-stdio build Much related/similar work also done by Ivan Nestlerode +Replace FILE BIO's with dummy ops that fail. +Include 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 Reviewed-by: Tim Hudson --- crypto/asn1/Makefile | 8 +++++--- crypto/asn1/a_strex.c | 2 ++ crypto/asn1/tasn_utl.c | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'crypto/asn1') diff --git a/crypto/asn1/Makefile b/crypto/asn1/Makefile index b0d4e14ec4..a6f1bac313 100644 --- a/crypto/asn1/Makefile +++ b/crypto/asn1/Makefile @@ -668,14 +668,16 @@ tasn_typ.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h tasn_typ.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tasn_typ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h tasn_typ.o: ../../include/openssl/symhacks.h tasn_typ.c -tasn_utl.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h -tasn_utl.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h +tasn_utl.o: ../../e_os.h ../../include/openssl/asn1.h +tasn_utl.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h +tasn_utl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h tasn_utl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h tasn_utl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h tasn_utl.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h tasn_utl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h tasn_utl.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -tasn_utl.o: ../../include/openssl/symhacks.h asn1_locl.h tasn_utl.c +tasn_utl.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h +tasn_utl.o: asn1_locl.h tasn_utl.c x_algor.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h x_algor.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h x_algor.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index 2f233a2608..c9d3cea036 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -92,6 +92,7 @@ static int send_bio_chars(void *arg, const void *buf, int len) return 1; } +#ifndef OPENSSL_NO_STDIO static int send_fp_chars(void *arg, const void *buf, int len) { if (!arg) @@ -100,6 +101,7 @@ static int send_fp_chars(void *arg, const void *buf, int len) return 0; return 1; } +#endif typedef int char_io (void *arg, const void *buf, int len); diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c index 76e96051bf..8b62341b9b 100644 --- a/crypto/asn1/tasn_utl.c +++ b/crypto/asn1/tasn_utl.c @@ -59,6 +59,7 @@ #include #include +#include #include #include #include -- cgit v1.2.3