diff options
| author | Emilia Kasper <emilia@openssl.org> | 2014-11-19 16:28:11 +0100 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2014-11-20 15:26:26 +0100 |
| commit | b8712b2b9a51d65127606fd25cb549d93406b7a0 (patch) | |
| tree | 8e5922facb1cef0deaacb9cc68f651b501b053b7 /ssl/ssl_locl.h | |
| parent | 1eaccbef5787a746305a99ad9b66cf2105344e87 (diff) | |
Remove ssl3_check_finished.
The client sends a session ID with the session ticket, and uses
the returned ID to detect resumption, so we do not need to peek
at handshake messages: s->hit tells us explicitly if we're resuming.
An equivalent change was independently made in BoringSSL, see commit
407886f589cf2dbaed82db0a44173036c3bc3317.
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 980bc1ec6114f5511b20c2e6ca741e61a39b99d6)
Conflicts:
ssl/d1_clnt.c
ssl/s3_clnt.c
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 98888d2df3..90c82f5b20 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1014,7 +1014,6 @@ int ssl3_get_key_exchange(SSL *s); int ssl3_get_server_certificate(SSL *s); int ssl3_check_cert_and_algorithm(SSL *s); #ifndef OPENSSL_NO_TLSEXT -int ssl3_check_finished(SSL *s); # ifndef OPENSSL_NO_NEXTPROTONEG int ssl3_send_next_proto(SSL *s); # endif |