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/pem/pem_pkey.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/pem/pem_pkey.c')
| -rw-r--r-- | crypto/pem/pem_pkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c index e9e41dd4e8..60942bf8e2 100644 --- a/crypto/pem/pem_pkey.c +++ b/crypto/pem/pem_pkey.c @@ -208,7 +208,7 @@ int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x) pem_str,bp,x,NULL,NULL,0,0,NULL); } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO EVP_PKEY *PEM_read_PrivateKey(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, void *u) { BIO *b; @@ -273,7 +273,7 @@ DH *PEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) return ret; } -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO DH *PEM_read_DHparams(FILE *fp, DH **x, pem_password_cb *cb, void *u) { BIO *b; |