projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
aes-x86_64.pl: commit#19797 was overzealous, partially reverse.
[oweals/openssl.git]
/
ssl
/
s23_clnt.c
diff --git
a/ssl/s23_clnt.c
b/ssl/s23_clnt.c
index bacf97c265dcb3a0ed11cc70b48edd7c4143e6e6..e6f9bf952a0f2198e106e868f18932f27300f394 100644
(file)
--- a/
ssl/s23_clnt.c
+++ b/
ssl/s23_clnt.c
@@
-129,6
+129,8
@@
static const SSL_METHOD *ssl23_get_client_method(int ver)
return(SSLv3_client_method());
else if (ver == TLS1_VERSION)
return(TLSv1_client_method());
return(SSLv3_client_method());
else if (ver == TLS1_VERSION)
return(TLSv1_client_method());
+ else if (ver == TLS1_1_VERSION)
+ return(TLSv1_1_client_method());
else
return(NULL);
}
else
return(NULL);
}
@@
-309,9
+311,6
@@
static int ssl23_client_hello(SSL *s)
ssl2_compat = 0;
if (s->tlsext_status_type != -1)
ssl2_compat = 0;
ssl2_compat = 0;
if (s->tlsext_status_type != -1)
ssl2_compat = 0;
- if (!(s->ctx->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION))
- ssl2_compat = 0;
-
#ifdef TLSEXT_TYPE_opaque_prf_input
if (s->ctx->tlsext_opaque_prf_input_callback != 0 || s->tlsext_opaque_prf_input != NULL)
ssl2_compat = 0;
#ifdef TLSEXT_TYPE_opaque_prf_input
if (s->ctx->tlsext_opaque_prf_input_callback != 0 || s->tlsext_opaque_prf_input != NULL)
ssl2_compat = 0;