diff options
-rw-r--r-- | crypto/asn1/a_strex.c | 8 | ||||
-rw-r--r-- | crypto/conf/conf_def.c | 2 | ||||
-rw-r--r-- | crypto/err/err.c | 2 | ||||
-rw-r--r-- | crypto/err/err_prn.c | 9 | ||||
-rw-r--r-- | crypto/hmac/hmac.c | 2 | ||||
-rw-r--r-- | crypto/mem_dbg.c | 2 | ||||
-rw-r--r-- | crypto/ui/ui_lib.c | 2 |
7 files changed, 17 insertions, 10 deletions
diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index bde666a6ff..cc6a25d4d9 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -58,12 +58,12 @@ #include <stdio.h> #include <string.h> +#include "cryptlib.h" #include <openssl/crypto.h> #include <openssl/x509.h> #include <openssl/asn1.h> #include "charmap.h" -#include "cryptlib.h" /* ASN1_STRING_print_ex() and X509_NAME_print_ex(). * Enhanced string and name printing routines handling @@ -513,7 +513,7 @@ int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags) return do_name_ex(send_bio_chars, out, nm, indent, flags); } - +#ifndef OPENSSL_NO_FP_API int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags) { if(flags == XN_FLAG_COMPAT) @@ -528,17 +528,19 @@ int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long fla } return do_name_ex(send_fp_chars, fp, nm, indent, flags); } +#endif int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags) { return do_print_ex(send_bio_chars, out, flags, str); } - +#ifndef OPENSSL_NO_FP_API int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags) { return do_print_ex(send_fp_chars, fp, flags, str); } +#endif /* Utility function: convert any string type to UTF8, returns number of bytes * in output string or a negative error code diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index f14de2293e..996a0999ac 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -60,6 +60,7 @@ #include <stdio.h> #include <string.h> +#include "cryptlib.h" #include <openssl/stack.h> #include <openssl/lhash.h> #include <openssl/conf.h> @@ -67,7 +68,6 @@ #include "conf_def.h" #include <openssl/buffer.h> #include <openssl/err.h> -#include "cryptlib.h" static char *eat_ws(CONF *conf, char *p); static char *eat_alpha_numeric(CONF *conf, char *p); diff --git a/crypto/err/err.c b/crypto/err/err.c index 549229bcfb..e084714383 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -112,9 +112,9 @@ #include <stdio.h> #include <stdarg.h> #include <string.h> +#include "cryptlib.h" #include <openssl/lhash.h> #include <openssl/crypto.h> -#include "cryptlib.h" #include <openssl/buffer.h> #include <openssl/bio.h> #include <openssl/err.h> diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c index 81e34bd6ce..2224a901e5 100644 --- a/crypto/err/err_prn.c +++ b/crypto/err/err_prn.c @@ -57,9 +57,9 @@ */ #include <stdio.h> +#include "cryptlib.h" #include <openssl/lhash.h> #include <openssl/crypto.h> -#include "cryptlib.h" #include <openssl/buffer.h> #include <openssl/err.h> @@ -86,7 +86,12 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), #ifndef OPENSSL_NO_FP_API static int print_fp(const char *str, size_t len, void *fp) { - return fprintf((FILE *)fp, "%s", str); + BIO bio; + + BIO_set(&bio,BIO_s_file()); + BIO_set_fp(&bio,fp,BIO_NOCLOSE); + + return BIO_printf(&bio, "%s", str); } void ERR_print_errors_fp(FILE *fp) { diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c index 16d95e08d5..c45e001492 100644 --- a/crypto/hmac/hmac.c +++ b/crypto/hmac/hmac.c @@ -58,8 +58,8 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <openssl/hmac.h> #include "cryptlib.h" +#include <openssl/hmac.h> void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, ENGINE *impl) diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index e212de27e4..557516bde9 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -59,11 +59,11 @@ #include <stdio.h> #include <stdlib.h> #include <time.h> +#include "cryptlib.h" #include <openssl/crypto.h> #include <openssl/buffer.h> #include <openssl/bio.h> #include <openssl/lhash.h> -#include "cryptlib.h" static int mh_mode=CRYPTO_MEM_CHECK_OFF; /* The state changes to CRYPTO_MEM_CHECK_ON | CRYPTO_MEM_CHECK_ENABLE diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c index 2d0d98926d..1a8f3ce113 100644 --- a/crypto/ui/ui_lib.c +++ b/crypto/ui/ui_lib.c @@ -57,12 +57,12 @@ */ #include <string.h> +#include "cryptlib.h" #include <openssl/e_os2.h> #include <openssl/buffer.h> #include <openssl/ui.h> #include <openssl/err.h> #include "ui_locl.h" -#include "cryptlib.h" IMPLEMENT_STACK_OF(UI_STRING_ST) |