diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-14 15:57:28 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-14 15:57:28 -0500 |
| commit | 4b618848f9beb8271f24883694e097caa70013c0 (patch) | |
| tree | 83a17961f721935b211a19bddf8ea02ab5760fb4 | |
| parent | b3d7294976c58e0e05d0ee44a0e7c9c3b8515e05 (diff) | |
Cleanup OPENSSL_NO_xxx, part 1master-pre-reformat
OPENSSL_NO_RIPEMD160, OPENSSL_NO_RIPEMD merged into OPENSSL_NO_RMD160
OPENSSL_NO_FP_API merged into OPENSSL_NO_STDIO
Two typo's on #endif comments fixed:
OPENSSL_NO_ECB fixed to OPENSSL_NO_OCB
OPENSSL_NO_HW_SureWare fixed to OPENSSL_NO_HW_SUREWARE
Reviewed-by: Richard Levitte <levitte@openssl.org>
53 files changed, 96 insertions, 96 deletions
@@ -40,6 +40,11 @@ WIN16 [Rich Salz] + *) Start cleaning up OPENSSL_NO_xxx #define's + OPENSSL_NO_RIPEMD160, OPENSSL_NO_RIPEMD merged into OPENSSL_NO_RMD160 + OPENSSL_NO_FP_API merged into OPENSSL_NO_STDIO + [Rich Salz] + *) Experimental support for a new, fast, unbiased prime candidate generator, bn_probable_prime_dh_coprime(). Not currently used by any prime generator. [Felix Laurie von Massenbach <felix@erbridge.co.uk>] diff --git a/apps/speed.c b/apps/speed.c index 3dcfb8d890..84fb4935f5 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -145,7 +145,7 @@ #ifndef OPENSSL_NO_SHA #include <openssl/sha.h> #endif -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 #include <openssl/ripemd.h> #endif #ifndef OPENSSL_NO_WHIRLPOOL @@ -392,7 +392,7 @@ int MAIN(int argc, char **argv) #ifndef OPENSSL_NO_WHIRLPOOL unsigned char whirlpool[WHIRLPOOL_DIGEST_LENGTH]; #endif -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 unsigned char rmd160[RIPEMD160_DIGEST_LENGTH]; #endif #ifndef OPENSSL_NO_RC4 @@ -849,7 +849,7 @@ int MAIN(int argc, char **argv) if (strcmp(*argv,"whirlpool") == 0) doit[D_WHIRLPOOL]=1; else #endif -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 if (strcmp(*argv,"ripemd") == 0) doit[D_RMD160]=1; else if (strcmp(*argv,"rmd160") == 0) doit[D_RMD160]=1; @@ -1073,12 +1073,12 @@ int MAIN(int argc, char **argv) #ifndef OPENSSL_NO_WHIRLPOOL BIO_printf(bio_err,"whirlpool"); #endif -#ifndef OPENSSL_NO_RIPEMD160 +#ifndef OPENSSL_NO_RMD160 BIO_printf(bio_err,"rmd160"); #endif #if !defined(OPENSSL_NO_MD2) || !defined(OPENSSL_NO_MDC2) || \ !defined(OPENSSL_NO_MD4) || !defined(OPENSSL_NO_MD5) || \ - !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RIPEMD160) || \ + !defined(OPENSSL_NO_SHA1) || !defined(OPENSSL_NO_RMD160) || \ !defined(OPENSSL_NO_WHIRLPOOL) BIO_printf(bio_err,"\n"); #endif @@ -1690,7 +1690,7 @@ int MAIN(int argc, char **argv) } #endif -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 if (doit[D_RMD160]) { for (j=0; j<SIZE_NUM; j++) diff --git a/crypto/asn1/a_d2i_fp.c b/crypto/asn1/a_d2i_fp.c index 52b2ebdb63..776f26e08f 100644 --- a/crypto/asn1/a_d2i_fp.c +++ b/crypto/asn1/a_d2i_fp.c @@ -65,7 +65,7 @@ static int asn1_d2i_read_bio(BIO *in, BUF_MEM **pb); #ifndef NO_OLD_ASN1 -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x) { @@ -120,7 +120,7 @@ err: return(ret); } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x) { BIO *b; diff --git a/crypto/asn1/a_i2d_fp.c b/crypto/asn1/a_i2d_fp.c index a3ad76d356..17269505a2 100644 --- a/crypto/asn1/a_i2d_fp.c +++ b/crypto/asn1/a_i2d_fp.c @@ -63,7 +63,7 @@ #ifndef NO_OLD_ASN1 -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x) { BIO *b; @@ -116,7 +116,7 @@ int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x) #endif -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x) { BIO *b; diff --git a/crypto/asn1/a_strex.c b/crypto/asn1/a_strex.c index 8fb4193bc0..4fc8983892 100644 --- a/crypto/asn1/a_strex.c +++ b/crypto/asn1/a_strex.c @@ -523,7 +523,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 +#ifndef OPENSSL_NO_STDIO int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags) { if(flags == XN_FLAG_COMPAT) @@ -545,7 +545,7 @@ 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 +#ifndef OPENSSL_NO_STDIO int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags) { return do_print_ex(send_fp_chars, fp, flags, str); diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 9adee694b0..25b703449f 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -980,7 +980,7 @@ void *ASN1_item_dup(const ASN1_ITEM *it, void *x); #define M_ASN1_free_of(x, type) \ ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type)) -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO void *ASN1_d2i_fp(void *(*xnew)(void), d2i_of_void *d2i, FILE *in, void **x); #define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \ diff --git a/crypto/asn1/t_crl.c b/crypto/asn1/t_crl.c index c61169208a..db33cd8c52 100644 --- a/crypto/asn1/t_crl.c +++ b/crypto/asn1/t_crl.c @@ -64,7 +64,7 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int X509_CRL_print_fp(FILE *fp, X509_CRL *x) { BIO *b; diff --git a/crypto/asn1/t_req.c b/crypto/asn1/t_req.c index 5d03db7a11..741158d8ca 100644 --- a/crypto/asn1/t_req.c +++ b/crypto/asn1/t_req.c @@ -70,7 +70,7 @@ #include <openssl/dsa.h> #endif -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int X509_REQ_print_fp(FILE *fp, X509_REQ *x) { BIO *b; diff --git a/crypto/asn1/t_x509.c b/crypto/asn1/t_x509.c index 111ea5aaac..89115c7f19 100644 --- a/crypto/asn1/t_x509.c +++ b/crypto/asn1/t_x509.c @@ -74,7 +74,7 @@ #include <openssl/x509v3.h> #include "asn1_locl.h" -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int X509_print_fp(FILE *fp, X509 *x) { return X509_print_ex_fp(fp, x, XN_FLAG_COMPAT, X509_FLAG_COMPAT); diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c index b3a5f7d031..34c8392126 100644 --- a/crypto/bio/b_dump.c +++ b/crypto/bio/b_dump.c @@ -157,7 +157,7 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u), return(ret); } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO static int write_fp(const void *data, size_t len, void *fp) { return UP_fwrite(data, len, 1, fp); diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index 3ea44ab263..e3ab9c406a 100644 --- a/crypto/bio/bio.h +++ b/crypto/bio/bio.h @@ -61,7 +61,7 @@ #include <openssl/e_os2.h> -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO # include <stdio.h> #endif #include <stdarg.h> @@ -635,7 +635,7 @@ int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix, int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix, asn1_ps_func **psuffix_free); -# ifndef OPENSSL_NO_FP_API +# ifndef OPENSSL_NO_STDIO BIO_METHOD *BIO_s_file(void ); BIO *BIO_new_file(const char *filename, const char *mode); BIO *BIO_new_fp(FILE *stream, int close_flag); @@ -709,7 +709,7 @@ int BIO_dump_indent_cb(int (*cb)(const void *data, size_t len, void *u), void *u, const char *s, int len, int indent); int BIO_dump(BIO *b,const char *bytes,int len); int BIO_dump_indent(BIO *b,const char *bytes,int len,int indent); -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int BIO_dump_fp(FILE *fp, const char *s, int len); int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent); #endif diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h index 5daee3858a..7ba9beeb09 100644 --- a/crypto/bn/bn.h +++ b/crypto/bn/bn.h @@ -126,7 +126,7 @@ #define HEADER_BN_H #include <openssl/e_os2.h> -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO #include <stdio.h> /* FILE */ #endif #include <openssl/ossl_typ.h> @@ -433,7 +433,7 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m,BN_CTX *ctx); int BN_mask_bits(BIGNUM *a,int n); -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int BN_print_fp(FILE *fp, const BIGNUM *a); #endif #ifdef HEADER_BIO_H diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c index 1743b6a7e2..a188f97b35 100644 --- a/crypto/bn/bn_print.c +++ b/crypto/bn/bn_print.c @@ -316,7 +316,7 @@ int BN_asc2bn(BIGNUM **bn, const char *a) } #ifndef OPENSSL_NO_BIO -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int BN_print_fp(FILE *fp, const BIGNUM *a) { BIO *b; diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h index c2199978a3..0570fc0a03 100644 --- a/crypto/conf/conf.h +++ b/crypto/conf/conf.h @@ -122,7 +122,7 @@ int CONF_set_default_method(CONF_METHOD *meth); void CONF_set_nconf(CONF *conf,LHASH_OF(CONF_VALUE) *hash); LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf,const char *file, long *eline); -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp, long *eline); #endif @@ -160,7 +160,7 @@ void NCONF_free(CONF *conf); void NCONF_free_data(CONF *conf); int NCONF_load(CONF *conf,const char *file,long *eline); -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int NCONF_load_fp(CONF *conf, FILE *fp,long *eline); #endif int NCONF_load_bio(CONF *conf, BIO *bp,long *eline); diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index 54046defca..35236d3ccd 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -110,7 +110,7 @@ LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file, return ltmp; } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp, long *eline) { @@ -202,7 +202,7 @@ void CONF_free(LHASH_OF(CONF_VALUE) *conf) NCONF_free_data(&ctmp); } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out) { BIO *btmp; @@ -273,7 +273,7 @@ int NCONF_load(CONF *conf, const char *file, long *eline) return conf->meth->load(conf, file, eline); } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int NCONF_load_fp(CONF *conf, FILE *fp,long *eline) { BIO *btmp; @@ -362,7 +362,7 @@ int NCONF_get_number_e(const CONF *conf,const char *group,const char *name, return 1; } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int NCONF_dump_fp(const CONF *conf, FILE *out) { BIO *btmp; diff --git a/crypto/crypto.h b/crypto/crypto.h index f5cb4c7106..1b76ada44c 100644 --- a/crypto/crypto.h +++ b/crypto/crypto.h @@ -122,7 +122,7 @@ #include <openssl/e_os2.h> -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO #include <stdio.h> #endif @@ -538,7 +538,7 @@ void CRYPTO_dbg_set_options(long bits); long CRYPTO_dbg_get_options(void); -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO void CRYPTO_mem_leaks_fp(FILE *); #endif void CRYPTO_mem_leaks(struct bio_st *bio); diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index 3f7dca1284..6e263f9dad 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -221,7 +221,7 @@ DH * d2i_DHparams(DH **a,const unsigned char **pp, long length); int i2d_DHparams(const DH *a,unsigned char **pp); DH * d2i_DHxparams(DH **a,const unsigned char **pp, long length); int i2d_DHxparams(const DH *a,unsigned char **pp); -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int DHparams_print_fp(FILE *fp, const DH *x); #endif #ifndef OPENSSL_NO_BIO diff --git a/crypto/dh/dh_prn.c b/crypto/dh/dh_prn.c index ae58c2ac87..78d1f98aac 100644 --- a/crypto/dh/dh_prn.c +++ b/crypto/dh/dh_prn.c @@ -61,7 +61,7 @@ #include <openssl/evp.h> #include <openssl/dh.h> -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int DHparams_print_fp(FILE *fp, const DH *x) { BIO *b; diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h index 8feb2a1582..28bb0c8a2c 100644 --- a/crypto/dsa/dsa.h +++ b/crypto/dsa/dsa.h @@ -257,7 +257,7 @@ int i2d_DSAparams(const DSA *a,unsigned char **pp); int DSAparams_print(BIO *bp, const DSA *x); int DSA_print(BIO *bp, const DSA *x, int off); #endif -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int DSAparams_print_fp(FILE *fp, const DSA *x); int DSA_print_fp(FILE *bp, const DSA *x, int off); #endif diff --git a/crypto/dsa/dsa_prn.c b/crypto/dsa/dsa_prn.c index 6f29f5e240..ab560164b7 100644 --- a/crypto/dsa/dsa_prn.c +++ b/crypto/dsa/dsa_prn.c @@ -61,7 +61,7 @@ #include <openssl/evp.h> #include <openssl/dsa.h> -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int DSA_print_fp(FILE *fp, const DSA *x, int off) { BIO *b; diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h index 477e476d08..5e89eea191 100644 --- a/crypto/ec/ec.h +++ b/crypto/ec/ec.h @@ -706,7 +706,7 @@ int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out); #ifndef OPENSSL_NO_BIO int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off); #endif -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off); #endif @@ -941,7 +941,7 @@ int ECParameters_print(BIO *bp, const EC_KEY *key); int EC_KEY_print(BIO *bp, const EC_KEY *key, int off); #endif -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO /** Prints out the ec parameters on human readable form. * \param fp file descriptor to which the information is printed * \param key EC_KEY object diff --git a/crypto/ec/eck_prn.c b/crypto/ec/eck_prn.c index 39ce97862d..f2c327d876 100644 --- a/crypto/ec/eck_prn.c +++ b/crypto/ec/eck_prn.c @@ -67,7 +67,7 @@ #include <openssl/ec.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off) { BIO *b; diff --git a/crypto/err/err.h b/crypto/err/err.h index 2a00e2805f..7fb73020ec 100644 --- a/crypto/err/err.h +++ b/crypto/err/err.h @@ -114,7 +114,7 @@ #include <openssl/e_os2.h> -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO #include <stdio.h> #include <stdlib.h> #endif @@ -339,7 +339,7 @@ const char *ERR_func_error_string(unsigned long e); const char *ERR_reason_error_string(unsigned long e); void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), void *u); -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO void ERR_print_errors_fp(FILE *fp); #endif #ifndef OPENSSL_NO_BIO diff --git a/crypto/err/err_prn.c b/crypto/err/err_prn.c index a0168ac8ed..3ed2bbef7c 100644 --- a/crypto/err/err_prn.c +++ b/crypto/err/err_prn.c @@ -86,7 +86,7 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), } } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO static int print_fp(const char *str, size_t len, void *fp) { BIO bio; diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c index 99f9cd568f..ea879db418 100644 --- a/crypto/evp/c_alld.c +++ b/crypto/evp/c_alld.c @@ -94,7 +94,7 @@ void OpenSSL_add_all_digests(void) #if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES) EVP_add_digest(EVP_mdc2()); #endif -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 EVP_add_digest(EVP_ripemd160()); EVP_add_digest_alias(SN_ripemd160,"ripemd"); EVP_add_digest_alias(SN_ripemd160,"rmd160"); diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 7290c10457..d062f9121e 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -754,7 +754,7 @@ const EVP_MD *EVP_sha512(void); #ifndef OPENSSL_NO_MDC2 const EVP_MD *EVP_mdc2(void); #endif -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 const EVP_MD *EVP_ripemd160(void); #endif #ifndef OPENSSL_NO_WHIRLPOOL diff --git a/crypto/evp/m_ripemd.c b/crypto/evp/m_ripemd.c index a1d60ee78d..330ff7ce71 100644 --- a/crypto/evp/m_ripemd.c +++ b/crypto/evp/m_ripemd.c @@ -59,7 +59,7 @@ #include <stdio.h> #include "cryptlib.h" -#ifndef OPENSSL_NO_RIPEMD +#ifndef OPENSSL_NO_RMD160 #include <openssl/ripemd.h> #include <openssl/evp.h> diff --git a/crypto/lhash/lh_stats.c b/crypto/lhash/lh_stats.c index 815615e338..35fcf4e912 100644 --- a/crypto/lhash/lh_stats.c +++ b/crypto/lhash/lh_stats.c @@ -138,7 +138,7 @@ void lh_node_usage_stats(LHASH *lh, FILE *out) #else -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO void lh_stats(const _LHASH *lh, FILE *fp) { BIO *bp; diff --git a/crypto/lhash/lhash.h b/crypto/lhash/lhash.h index e7d8763591..9f431d66ec 100644 --- a/crypto/lhash/lhash.h +++ b/crypto/lhash/lhash.h @@ -64,7 +64,7 @@ #define HEADER_LHASH_H #include <openssl/e_os2.h> -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO #include <stdio.h> #endif @@ -182,7 +182,7 @@ void lh_doall_arg(_LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, void *arg); unsigned long lh_strhash(const char *c); unsigned long lh_num_items(const _LHASH *lh); -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO void lh_stats(const _LHASH *lh, FILE *out); void lh_node_stats(const _LHASH *lh, FILE *out); void lh_node_usage_stats(const _LHASH *lh, FILE *out); diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c index ac793397f1..c550a9b91c 100644 --- a/crypto/mem_dbg.c +++ b/crypto/mem_dbg.c @@ -822,7 +822,7 @@ void CRYPTO_mem_leaks(BIO *b) MemCheck_on(); /* release MALLOC2 lock */ } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO void CRYPTO_mem_leaks_fp(FILE *fp) { BIO *b; diff --git a/crypto/modes/modes.h b/crypto/modes/modes.h index 3fb1b4b58b..457709b8fa 100644 --- a/crypto/modes/modes.h +++ b/crypto/modes/modes.h @@ -173,7 +173,7 @@ int CRYPTO_ocb128_finish(OCB128_CONTEXT *ctx,const unsigned char *tag, size_t len); int CRYPTO_ocb128_tag(OCB128_CONTEXT *ctx, unsigned char *tag, size_t len); void CRYPTO_ocb128_cleanup(OCB128_CONTEXT *ctx); -#endif /* OPENSSL_NO_ECB */ +#endif /* OPENSSL_NO_OCB */ #ifdef __cplusplus } diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index 7c9b92a7da..6de9c70b68 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -213,7 +213,7 @@ typedef struct pem_ctx_st * IMPLEMENT_PEM_rw(...) or IMPLEMENT_PEM_rw_cb(...) */ -#ifdef OPENSSL_NO_FP_API +#ifdef OPENSSL_NO_STDIO #define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/ #define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/ @@ -325,7 +325,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ /* These are the same except they are for the declarations */ -#if defined(OPENSSL_NO_FP_API) +#if defined(OPENSSL_NO_STDIO) #define DECLARE_PEM_read_fp(name, type) /**/ #define DECLARE_PEM_write_fp(name, type) /**/ diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index 5c8c6f4158..ab83eae8be 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -181,7 +181,7 @@ RSA *PEM_read_bio_RSAPrivateKey(BIO *bp, RSA **rsa, pem_password_cb *cb, return pkey_get_rsa(pktmp, rsa); } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO RSA *PEM_read_RSAPrivateKey(FILE *fp, RSA **rsa, pem_password_cb *cb, void *u) @@ -226,7 +226,7 @@ DSA *PEM_read_bio_DSAPrivateKey(BIO *bp, DSA **dsa, pem_password_cb *cb, IMPLEMENT_PEM_write_cb_const(DSAPrivateKey, DSA, PEM_STRING_DSA, DSAPrivateKey) IMPLEMENT_PEM_rw(DSA_PUBKEY, DSA, PEM_STRING_PUBLIC, DSA_PUBKEY) -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO DSA *PEM_read_DSAPrivateKey(FILE *fp, DSA **dsa, pem_password_cb *cb, void *u) @@ -273,7 +273,7 @@ IMPLEMENT_PEM_write_cb(ECPrivateKey, EC_ |