diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-02-03 11:13:12 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-02-03 11:13:12 -0500 |
| commit | 27582325dc691f02c41612a258483a73f2e0e000 (patch) | |
| tree | 61314753c73f7ee49a2f94cff54a86f2ad6d7733 /src/common/compat_openssl.h | |
| parent | 957cdb54699937818b539c75e413e88760ee34cd (diff) | |
| download | tor-27582325dc691f02c41612a258483a73f2e0e000.tar.gz tor-27582325dc691f02c41612a258483a73f2e0e000.zip | |
Make Tor build happily with OpenSSL master and libressl.
Also tested with 1.0.0t and 1.0.2f.
Closes ticket 19784.
Closes most of 17921. (Still need to make some tests pass.)
Diffstat (limited to 'src/common/compat_openssl.h')
| -rw-r--r-- | src/common/compat_openssl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/compat_openssl.h b/src/common/compat_openssl.h index 9c98181bdd..d5333a26d6 100644 --- a/src/common/compat_openssl.h +++ b/src/common/compat_openssl.h @@ -35,9 +35,11 @@ (((st) == SSL3_ST_SW_SRVR_HELLO_A) || \ ((st) == SSL3_ST_SW_SRVR_HELLO_B)) #define OSSL_HANDSHAKE_STATE int +#define CONST_IF_OPENSSL_1_1_API #else #define STATE_IS_SW_SERVER_HELLO(st) \ ((st) == TLS_ST_SW_SRVR_HELLO) +#define CONST_IF_OPENSSL_1_1_API const #endif #endif |