diff options
author | tedu <> | 2014-04-14 18:45:55 +0000 |
---|---|---|
committer | tedu <> | 2014-04-14 18:45:55 +0000 |
commit | 95635d69892027aae43126c720bdf465c55b75b4 (patch) | |
tree | cf54816807c3e7c50d1a7df6ceac26ecda2c9f53 /src/lib/libssl/ssl_locl.h | |
parent | 4de5e966312f32adfcbfa844e67772602bb18ed6 (diff) | |
download | openbsd-95635d69892027aae43126c720bdf465c55b75b4.tar.gz openbsd-95635d69892027aae43126c720bdf465c55b75b4.tar.bz2 openbsd-95635d69892027aae43126c720bdf465c55b75b4.zip |
make OPENSSL_NO_HEARTBLEED the default and only option. ok deraadt miod
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 42271d634f..7311d984ae 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1108,13 +1108,6 @@ int ssl_check_clienthello_tlsext_early(SSL *s); | |||
1108 | int ssl_check_clienthello_tlsext_late(SSL *s); | 1108 | int ssl_check_clienthello_tlsext_late(SSL *s); |
1109 | int ssl_check_serverhello_tlsext(SSL *s); | 1109 | int ssl_check_serverhello_tlsext(SSL *s); |
1110 | 1110 | ||
1111 | #ifndef OPENSSL_NO_HEARTBEATS | ||
1112 | int tls1_heartbeat(SSL *s); | ||
1113 | int dtls1_heartbeat(SSL *s); | ||
1114 | int tls1_process_heartbeat(SSL *s); | ||
1115 | int dtls1_process_heartbeat(SSL *s); | ||
1116 | #endif | ||
1117 | |||
1118 | #ifdef OPENSSL_NO_SHA256 | 1111 | #ifdef OPENSSL_NO_SHA256 |
1119 | #define tlsext_tick_md EVP_sha1 | 1112 | #define tlsext_tick_md EVP_sha1 |
1120 | #else | 1113 | #else |