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/record/rec_layer_s3.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/record/rec_layer_s3.c')
| -rw-r--r-- | ssl/record/rec_layer_s3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index feca76eb3f..b21227765a 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -1508,9 +1508,9 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf, && (s->server || rr->type != SSL3_RT_ALERT)) { /* * If we've got this far and still haven't decided on what version - * we're using then this must be a client side alert we're dealing with - * (we don't allow heartbeats yet). We shouldn't be receiving anything - * other than a ClientHello if we are a server. + * we're using then this must be a client side alert we're dealing + * with. We shouldn't be receiving anything other than a ClientHello + * if we are a server. */ s->version = rr->rec_version; SSLfatal(s, SSL_AD_UNEXPECTED_MESSAGE, SSL_F_SSL3_READ_BYTES, |