Undo.

diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index 36f609bd097a37b27ae3031b7b3b62c83c245e2c..386ebe3f8eedae92a55f0c17432a383ad1af49f0 100644 (file)
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -68,10 +68,8 @@ static int ssl23_client_hello(SSL *s);
 static int ssl23_get_server_hello(SSL *s);
 static SSL_METHOD *ssl23_get_client_method(int ver)
        {
-#ifndef NO_RSA
        if (ver == SSL2_VERSION)
                return(SSLv2_client_method());
-#endif
        if (ver == SSL3_VERSION)
                return(SSLv3_client_method());
        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) &&
                (p[5] == 0x00) && (p[6] == 0x02))
                {
-#ifdef NO_RSA
-               goto err;
-#else
                /* we are talking sslv2 */
                /* we need to clean up the SSLv3 setup and put in the
                 * sslv2 stuff. */
@@ -380,7 +375,6 @@ static int ssl23_get_server_hello(SSL *s)
 
                s->method=SSLv2_client_method();
                s->handshake_func=s->method->ssl_connect;
-#endif
                }
        else if ((p[0] == SSL3_RT_HANDSHAKE) &&
                 (p[1] == SSL3_VERSION_MAJOR) &&

diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index e74e019f1ddd32e860745c818f62e7078b9fb19c..e4122f2d78df2032fe729bc818a5add03891a8ed 100644 (file)
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -67,10 +67,8 @@ static SSL_METHOD *ssl23_get_server_method(int ver);
 int ssl23_get_client_hello(SSL *s);
 static SSL_METHOD *ssl23_get_server_method(int ver)
        {
-#ifndef NO_RSA
        if (ver == SSL2_VERSION)
                return(SSLv2_server_method());
-#endif
        if (ver == SSL3_VERSION)
                return(SSLv3_server_method());
        else if (ver == TLS1_VERSION)
@@ -406,9 +404,6 @@ next_bit:
 
        if (type == 1)
                {
-#ifdef NO_RSA
-               goto err;
-#else
                /* we are talking sslv2 */
                /* we need to clean up the SSLv3/TLSv1 setup and put in the
                 * sslv2 stuff. */
@@ -447,7 +442,6 @@ next_bit:
 
                s->method=SSLv2_server_method();
                s->handshake_func=s->method->ssl_accept;
-#endif
                }
 
        if ((type == 2) || (type == 3))