PR: 2714

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 92bd28b8e388febca45cf75fc091403366fe1e35..de737807b7e1a92c3e12ab19e87b6586f9b1ff1b 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2275,6 +2275,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 { static count=0; if (++count == 100) { count=0; SSL_renegotiate(con); } }
 #endif
                                k=SSL_write(con,&(buf[l]),(unsigned int)i);
+#ifndef OPENSSL_NO_SRP
                                while (SSL_get_error(con,k) == SSL_ERROR_WANT_X509_LOOKUP)
                                        {
                                        BIO_printf(bio_s_out,"LOOKUP renego during write\n");
@@ -2285,6 +2286,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
                                                BIO_printf(bio_s_out,"LOOKUP not successful\n");
                                                k=SSL_write(con,&(buf[l]),(unsigned int)i);
                                        }
+#endif
                                switch (SSL_get_error(con,k))
                                        {
                                case SSL_ERROR_NONE:
@@ -2332,6 +2334,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
                                {
 again: 
                                i=SSL_read(con,(char *)buf,bufsize);
+#ifndef OPENSSL_NO_SRP
                                while (SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP)
                                        {
                                        BIO_printf(bio_s_out,"LOOKUP renego during read\n");
@@ -2342,6 +2345,7 @@ again:
                                                BIO_printf(bio_s_out,"LOOKUP not successful\n");
                                        i=SSL_read(con,(char *)buf,bufsize);
                                        }
+#endif
                                switch (SSL_get_error(con,i))
                                        {
                                case SSL_ERROR_NONE:
@@ -2419,6 +2423,7 @@ static int init_ssl_connection(SSL *con)
 
 
        i=SSL_accept(con);
+#ifndef OPENSSL_NO_SRP
        while (i <= 0 &&  SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP) 
                {
                        BIO_printf(bio_s_out,"LOOKUP during accept %s\n",srp_callback_parm.login);
@@ -2429,6 +2434,7 @@ static int init_ssl_connection(SSL *con)
                                BIO_printf(bio_s_out,"LOOKUP not successful\n");
                        i=SSL_accept(con);
                }
+#endif
        if (i <= 0)
                {
                if (BIO_sock_should_retry(i))
@@ -2649,6 +2655,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
                if (hack)
                        {
                        i=SSL_accept(con);
+#ifndef OPENSSL_NO_SRP
                        while (i <= 0 &&  SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP) 
                {
                        BIO_printf(bio_s_out,"LOOKUP during accept %s\n",srp_callback_parm.login);
@@ -2659,7 +2666,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
                                BIO_printf(bio_s_out,"LOOKUP not successful\n");
                        i=SSL_accept(con);
                }
-
+#endif
                        switch (SSL_get_error(con,i))
                                {
                        case SSL_ERROR_NONE: