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 /ssl | |
parent | b3d7294976c58e0e05d0ee44a0e7c9c3b8515e05 (diff) | |
download | openssl-4b618848f9beb8271f24883694e097caa70013c0.zip openssl-4b618848f9beb8271f24883694e097caa70013c0.tar.gz openssl-4b618848f9beb8271f24883694e097caa70013c0.tar.bz2 |
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 'ssl')
-rw-r--r-- | ssl/ssl.h | 2 | ||||
-rw-r--r-- | ssl/ssl_txt.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -2106,7 +2106,7 @@ SSL_SESSION *SSL_SESSION_new(void); const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len); unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s); -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int SSL_SESSION_print_fp(FILE *fp,const SSL_SESSION *ses); #endif #ifndef OPENSSL_NO_BIO diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c index b09feca..7d0effb 100644 --- a/ssl/ssl_txt.c +++ b/ssl/ssl_txt.c @@ -86,7 +86,7 @@ #include <openssl/buffer.h> #include "ssl_locl.h" -#ifndef OPENSSL_NO_FP_API +#ifndef OPENSSL_NO_STDIO int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x) { BIO *b; |