diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-11-15 14:53:33 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-11-15 14:53:33 +0100 |
| commit | b612799a80af398040efc2416e0d09dcb0da1cf5 (patch) | |
| tree | fdc1238fdb3b4c6b642373b068708af7beea2ba1 /ssl | |
| parent | 6c62f9e1639a7d1a879f363a99882920104dfedb (diff) | |
Revert "Remove heartbeats completely"
Done too soon, this is for future OpenSSL 1.2.0
This reverts commit 6c62f9e1639a7d1a879f363a99882920104dfedb.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_lib.c | 7 | ||||
| -rw-r--r-- | ssl/ssl_err.c | 5 | ||||
| -rw-r--r-- | ssl/t1_trce.c | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 8aab778ba6..2439167307 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3047,6 +3047,13 @@ 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); diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index 95397661c1..6c438fe2fe 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -30,6 +30,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { {ERR_FUNC(SSL_F_DO_SSL3_WRITE), "do_ssl3_write"}, {ERR_FUNC(SSL_F_DTLS1_BUFFER_RECORD), "dtls1_buffer_record"}, {ERR_FUNC(SSL_F_DTLS1_CHECK_TIMEOUT_NUM), "dtls1_check_timeout_num"}, + {ERR_FUNC(SSL_F_DTLS1_HEARTBEAT), "dtls1_heartbeat"}, {ERR_FUNC(SSL_F_DTLS1_PREPROCESS_FRAGMENT), "dtls1_preprocess_fragment"}, {ERR_FUNC(SSL_F_DTLS1_PROCESS_BUFFERED_RECORDS), "dtls1_process_buffered_records"}, @@ -619,6 +620,10 @@ static ERR_STRING_DATA SSL_str_reasons[] = { {ERR_REASON(SSL_R_TLSV1_UNRECOGNIZED_NAME), "tlsv1 unrecognized name"}, {ERR_REASON(SSL_R_TLSV1_UNSUPPORTED_EXTENSION), "tlsv1 unsupported extension"}, + {ERR_REASON(SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT), + "peer does not accept heartbeats"}, + {ERR_REASON(SSL_R_TLS_HEARTBEAT_PENDING), + "heartbeat request already pending"}, {ERR_REASON(SSL_R_TLS_ILLEGAL_EXPORTER_LABEL), "tls illegal exporter label"}, {ERR_REASON(SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST), diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index e12a4a849b..2e94c65bdf 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -710,6 +710,9 @@ static int ssl_print_extension(BIO *bio, int indent, int server, int extype, } break; + case TLSEXT_TYPE_heartbeat: + return 0; + case TLSEXT_TYPE_session_ticket: if (extlen != 0) ssl_print_hex(bio, indent + 4, "ticket", ext, extlen); |