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 /ssl/s23_clnt.c | |
| parent | 32ec41539b5b23bc42503589fcc5be65d648d1f5 (diff) | |
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 'ssl/s23_clnt.c')
| -rw-r--r-- | ssl/s23_clnt.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index 34343402c8..75a0582f95 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -116,9 +116,11 @@ #include <openssl/objects.h> #include <openssl/evp.h> -static const SSL_METHOD *ssl23_get_client_method(int ver); +/*static const SSL_METHOD *ssl23_get_client_method(int ver);*/ static int ssl23_client_hello(SSL *s); static int ssl23_get_server_hello(SSL *s); + +/* static const SSL_METHOD *ssl23_get_client_method(int ver) { #ifndef OPENSSL_NO_SSL3 @@ -134,10 +136,7 @@ static const SSL_METHOD *ssl23_get_client_method(int ver) else return (NULL); } - -IMPLEMENT_ssl23_meth_func(SSLv23_client_method, - ssl_undefined_function, - ssl23_connect, ssl23_get_client_method) +*/ int ssl23_connect(SSL *s) { |