diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-12-31 23:00:36 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-12-31 23:00:36 +0000 |
| commit | bd6941cfaa31ee8a3f8661cb98227a5cbcc0f9f3 (patch) | |
| tree | 218fef78d2db96f5eb399893de2f44f448c58a84 /ssl/s3_srvr.c | |
| parent | 578519edd0d0a810a11bfb7baede0f7b99c7d92b (diff) | |
PR: 2658
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Reviewed by: steve
Support for TLS/DTLS heartbeats.
Diffstat (limited to 'ssl/s3_srvr.c')
| -rw-r--r-- | ssl/s3_srvr.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 3609aba5f2..e26226b5a3 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -236,6 +236,18 @@ int ssl3_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) + { + s->tlsext_hb_pending = 0; + s->tlsext_hb_seq++; + } +#endif + for (;;) { state=s->state; |