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 /crypto/asn1/a_d2i_fp.c | |
| 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>
Diffstat (limited to 'crypto/asn1/a_d2i_fp.c')
| -rw-r--r-- | crypto/asn1/a_d2i_fp.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |