diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-15 14:55:40 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-29 13:50:59 +0100 |
| commit | 558ea84743918f7a93bfbfc259f86ad1fa4c8de9 (patch) | |
| tree | 16690b411af8e6456852f57d41b0aff86a4ecf16 /ssl/s3_lib.c | |
| parent | d88736df4d19521664ebb125ff66e0d7b085a53c (diff) | |
Remove heartbeats completely
Fixes #4856
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1928)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index a3639fd18c..330b9e3f0c 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3547,13 +3547,6 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) ret = 1; break; -#ifndef OPENSSL_NO_HEARTBEATS - case SSL_CTRL_DTLS_EXT_SEND_HEARTBEAT: - case SSL_CTRL_GET_DTLS_EXT_HEARTBEAT_PENDING: - case SSL_CTRL_SET_DTLS_EXT_HEARTBEAT_NO_REQUESTS: - break; -#endif - case SSL_CTRL_CHAIN: if (larg) return ssl_cert_set1_chain(s, NULL, (STACK_OF(X509) *)parg); |