diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-01-14 21:57:28 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-01-14 21:57:28 +0100 |
| commit | 4b618848f9beb8271f24883694e097caa70013c0 (patch) | |
| tree | 83a17961f721935b211a19bddf8ea02ab5760fb4 /crypto/conf | |
| parent | Add Broadwell performance results. (diff) | |
| download | openssl-4b618848f9beb8271f24883694e097caa70013c0.tar.xz openssl-4b618848f9beb8271f24883694e097caa70013c0.zip | |
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>
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf.h | 4 | ||||
| -rw-r--r-- | crypto/conf/conf_lib.c | 8 |
2 files changed, 6 insertions, 6 deletions
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; |