diff options
author | Rich Salz <rsalz@openssl.org> | 2016-03-18 14:30:20 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-03-20 19:48:36 -0400 |
commit | 3c27208fab1dc29f47f088490404df5abfcdfb05 (patch) | |
tree | 3654ea8c099e19203a48ce2688aeee02f46fd12b /ssl/t1_lib.c | |
parent | 8230f6c764f854190358cf40f0e7e7ca5647d8cd (diff) |
Remove #error from include files.
Don't have #error statements in header files, but instead wrap
the contents of that file in #ifndef OPENSSL_NO_xxx
This means it is now always safe to include the header file.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/t1_lib.c')
-rw-r--r-- | ssl/t1_lib.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index fc7ebe41ca..26c02a0e44 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -115,14 +115,10 @@ #include <openssl/hmac.h> #include <openssl/ocsp.h> #include <openssl/rand.h> -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -# include <openssl/bn.h> -#endif +#include <openssl/dh.h> +#include <openssl/bn.h> #include "ssl_locl.h" -#ifndef OPENSSL_NO_CT -# include <openssl/ct.h> -#endif +#include <openssl/ct.h> static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen, const unsigned char *sess_id, int sesslen, |