diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-01-25 19:30:37 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-11 18:57:26 +0100 |
| commit | 22e3dcb7808bb06cd18c3231e34a5930e796cc48 (patch) | |
| tree | f4143956f14f3eb5bd225021b8f09ad66554e025 /ssl/d1_lib.c | |
| parent | Move to REF_DEBUG, for consistency. (diff) | |
| download | openssl-22e3dcb7808bb06cd18c3231e34a5930e796cc48.tar.xz openssl-22e3dcb7808bb06cd18c3231e34a5930e796cc48.zip | |
Remove TLS heartbeat, disable DTLS heartbeat
To enable heartbeats for DTLS, configure with enable-heartbeats.
Heartbeats for TLS have been completely removed.
This addresses RT 3647
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/d1_lib.c')
| -rw-r--r-- | ssl/d1_lib.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index b1f6ed207d..8b3e941570 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -916,7 +916,7 @@ int dtls1_process_heartbeat(SSL *s, unsigned char *p, unsigned int length) unsigned int padding = 16; /* Use minimum padding */ if (s->msg_callback) - s->msg_callback(0, s->version, TLS1_RT_HEARTBEAT, + s->msg_callback(0, s->version, DTLS1_RT_HEARTBEAT, p, length, s, s->msg_callback_arg); /* Read type and payload length first */ @@ -961,10 +961,10 @@ int dtls1_process_heartbeat(SSL *s, unsigned char *p, unsigned int length) return -1; } - r = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buffer, write_length); + r = dtls1_write_bytes(s, DTLS1_RT_HEARTBEAT, buffer, write_length); if (r >= 0 && s->msg_callback) - s->msg_callback(1, s->version, TLS1_RT_HEARTBEAT, + s->msg_callback(1, s->version, DTLS1_RT_HEARTBEAT, buffer, write_length, s, s->msg_callback_arg); OPENSSL_free(buffer); @@ -998,8 +998,8 @@ int dtls1_heartbeat(SSL *s) unsigned int padding = 16; /* Use minimum padding */ /* Only send if peer supports and accepts HB requests... */ - if (!(s->tlsext_heartbeat & SSL_TLSEXT_HB_ENABLED) || - s->tlsext_heartbeat & SSL_TLSEXT_HB_DONT_SEND_REQUESTS) { + if (!(s->tlsext_heartbeat & SSL_DTLSEXT_HB_ENABLED) || + s->tlsext_heartbeat & SSL_DTLSEXT_HB_DONT_SEND_REQUESTS) { SSLerr(SSL_F_DTLS1_HEARTBEAT, SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT); return -1; } @@ -1050,10 +1050,10 @@ int dtls1_heartbeat(SSL *s) goto err; } - ret = dtls1_write_bytes(s, TLS1_RT_HEARTBEAT, buf, 3 + payload + padding); + ret = dtls1_write_bytes(s, DTLS1_RT_HEARTBEAT, buf, 3 + payload + padding); if (ret >= 0) { if (s->msg_callback) - s->msg_callback(1, s->version, TLS1_RT_HEARTBEAT, + s->msg_callback(1, s->version, DTLS1_RT_HEARTBEAT, buf, 3 + payload + padding, s, s->msg_callback_arg); |