diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-06 11:22:28 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-11-15 10:45:21 +0100 |
| commit | 6c62f9e1639a7d1a879f363a99882920104dfedb (patch) | |
| tree | c3696f02ee053fc5bf9e2250b811973d5aaedd51 /ssl/s3_lib.c | |
| parent | 54c68d35c6b7e7650856beb949b45363ce40ca93 (diff) | |
| download | openssl-6c62f9e1639a7d1a879f363a99882920104dfedb.tar.gz | |
Remove heartbeats completely
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1669)
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 2439167307..8aab778ba6 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3047,13 +3047,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); |