diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-12-31 22:59:57 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-12-31 22:59:57 +0000 |
| commit | 4817504d069b4c5082161b02a22116ad75f822b1 (patch) | |
| tree | 7a85f6af852e34e5b80080b50d80741f6ab36c5a /ssl/d1_srvr.c | |
| parent | 84b6e277d4f45487377d0159e82c356d750e1218 (diff) | |
PR: 2658
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Reviewed by: steve
Support for TLS/DTLS heartbeats.
Diffstat (limited to 'ssl/d1_srvr.c')
| -rw-r--r-- | ssl/d1_srvr.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ssl/d1_srvr.c b/ssl/d1_srvr.c index 24e0553086..6af53b2ff4 100644 --- a/ssl/d1_srvr.c +++ b/ssl/d1_srvr.c @@ -186,6 +186,19 @@ int dtls1_accept(SSL *s) return(-1); } +#ifndef OPENSSL_NO_HEARTBEATS + /* If we're awaiting a HeartbeatResponse, pretend we + * already got and don't await it anymore, because + * Heartbeats don't make sense during handshakes anyway. + */ + if (s->tlsext_hb_pending) + { + dtls1_stop_timer(s); + s->tlsext_hb_pending = 0; + s->tlsext_hb_seq++; + } +#endif + for (;;) { state=s->state; |