diff options
| author | Matt Caswell <matt@openssl.org> | 2015-03-31 00:18:31 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-05-16 09:20:31 +0100 |
| commit | 13c9bb3ecec5f847b4c5295249e039d386e2d10e (patch) | |
| tree | 8a3c816a718d72049d44dc24b6c2239fe954eab0 /include | |
| parent | 32ec41539b5b23bc42503589fcc5be65d648d1f5 (diff) | |
| download | openssl-13c9bb3ecec5f847b4c5295249e039d386e2d10e.tar.gz | |
Client side version negotiation rewrite
Continuing from the previous commit this changes the way we do client side
version negotiation. Similarly all of the s23* "up front" state machine code
has been avoided and again things now work much the same way as they already
did for DTLS, i.e. we just do most of the work in the
ssl3_get_server_hello() function.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index f169fcd2a9..3f30bc2a88 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1565,14 +1565,13 @@ __owur const SSL_METHOD *SSLv3_client_method(void); /* SSLv3 */ #ifdef OPENSSL_USE_DEPRECATED #define SSLv23_method TLS_method #define SSLv23_server_method TLS_server_method +#define SSLv23_client_method TLS_client_method #endif -/* This next one will be deprecated in a subsequent commit */ -__owur const SSL_METHOD *SSLv23_client_method(void); /* Negotiate highest available - * SSL/TLS version */ /* Negotiate highest available SSL/TLS version */ __owur const SSL_METHOD *TLS_method(void); __owur const SSL_METHOD *TLS_server_method(void); +__owur const SSL_METHOD *TLS_client_method(void); __owur const SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */ __owur const SSL_METHOD *TLSv1_server_method(void); /* TLSv1.0 */ |