Undo.
This commit is contained in:
parent
d02f751ce1
commit
61f217eec2
@ -68,10 +68,8 @@ static int ssl23_client_hello(SSL *s);
|
|||||||
static int ssl23_get_server_hello(SSL *s);
|
static int ssl23_get_server_hello(SSL *s);
|
||||||
static SSL_METHOD *ssl23_get_client_method(int ver)
|
static SSL_METHOD *ssl23_get_client_method(int ver)
|
||||||
{
|
{
|
||||||
#ifndef NO_RSA
|
|
||||||
if (ver == SSL2_VERSION)
|
if (ver == SSL2_VERSION)
|
||||||
return(SSLv2_client_method());
|
return(SSLv2_client_method());
|
||||||
#endif
|
|
||||||
if (ver == SSL3_VERSION)
|
if (ver == SSL3_VERSION)
|
||||||
return(SSLv3_client_method());
|
return(SSLv3_client_method());
|
||||||
else if (ver == TLS1_VERSION)
|
else if (ver == TLS1_VERSION)
|
||||||
@ -322,9 +320,6 @@ static int ssl23_get_server_hello(SSL *s)
|
|||||||
if ((p[0] & 0x80) && (p[2] == SSL2_MT_SERVER_HELLO) &&
|
if ((p[0] & 0x80) && (p[2] == SSL2_MT_SERVER_HELLO) &&
|
||||||
(p[5] == 0x00) && (p[6] == 0x02))
|
(p[5] == 0x00) && (p[6] == 0x02))
|
||||||
{
|
{
|
||||||
#ifdef NO_RSA
|
|
||||||
goto err;
|
|
||||||
#else
|
|
||||||
/* we are talking sslv2 */
|
/* we are talking sslv2 */
|
||||||
/* we need to clean up the SSLv3 setup and put in the
|
/* we need to clean up the SSLv3 setup and put in the
|
||||||
* sslv2 stuff. */
|
* sslv2 stuff. */
|
||||||
@ -380,7 +375,6 @@ static int ssl23_get_server_hello(SSL *s)
|
|||||||
|
|
||||||
s->method=SSLv2_client_method();
|
s->method=SSLv2_client_method();
|
||||||
s->handshake_func=s->method->ssl_connect;
|
s->handshake_func=s->method->ssl_connect;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
else if ((p[0] == SSL3_RT_HANDSHAKE) &&
|
else if ((p[0] == SSL3_RT_HANDSHAKE) &&
|
||||||
(p[1] == SSL3_VERSION_MAJOR) &&
|
(p[1] == SSL3_VERSION_MAJOR) &&
|
||||||
|
@ -67,10 +67,8 @@ static SSL_METHOD *ssl23_get_server_method(int ver);
|
|||||||
int ssl23_get_client_hello(SSL *s);
|
int ssl23_get_client_hello(SSL *s);
|
||||||
static SSL_METHOD *ssl23_get_server_method(int ver)
|
static SSL_METHOD *ssl23_get_server_method(int ver)
|
||||||
{
|
{
|
||||||
#ifndef NO_RSA
|
|
||||||
if (ver == SSL2_VERSION)
|
if (ver == SSL2_VERSION)
|
||||||
return(SSLv2_server_method());
|
return(SSLv2_server_method());
|
||||||
#endif
|
|
||||||
if (ver == SSL3_VERSION)
|
if (ver == SSL3_VERSION)
|
||||||
return(SSLv3_server_method());
|
return(SSLv3_server_method());
|
||||||
else if (ver == TLS1_VERSION)
|
else if (ver == TLS1_VERSION)
|
||||||
@ -406,9 +404,6 @@ next_bit:
|
|||||||
|
|
||||||
if (type == 1)
|
if (type == 1)
|
||||||
{
|
{
|
||||||
#ifdef NO_RSA
|
|
||||||
goto err;
|
|
||||||
#else
|
|
||||||
/* we are talking sslv2 */
|
/* we are talking sslv2 */
|
||||||
/* we need to clean up the SSLv3/TLSv1 setup and put in the
|
/* we need to clean up the SSLv3/TLSv1 setup and put in the
|
||||||
* sslv2 stuff. */
|
* sslv2 stuff. */
|
||||||
@ -447,7 +442,6 @@ next_bit:
|
|||||||
|
|
||||||
s->method=SSLv2_server_method();
|
s->method=SSLv2_server_method();
|
||||||
s->handshake_func=s->method->ssl_accept;
|
s->handshake_func=s->method->ssl_accept;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((type == 2) || (type == 3))
|
if ((type == 2) || (type == 3))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user