PR: 2714

Submitted by: Tomas Mraz <tmraz@redhat.com>

Make no-srp work.

diff --git a/apps/progs.h b/apps/progs.h
index e91b884a9cc8d9f906972ea9c7ea7ea44a4fa2ad..949e78066b78e6049dc55f82d25ec9bd0bc0f6ca 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -44,9 +44,9 @@ extern int smime_main(int argc,char *argv[]);
 extern int rand_main(int argc,char *argv[]);
 extern int engine_main(int argc,char *argv[]);
 extern int ocsp_main(int argc,char *argv[]);
-extern int srp_main(int argc,char *argv[]);
 extern int prime_main(int argc,char *argv[]);
 extern int ts_main(int argc,char *argv[]);
+extern int srp_main(int argc,char *argv[]);
 
 #define FUNC_TYPE_GENERAL      1
 #define FUNC_TYPE_MD           2
@@ -146,11 +146,11 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_OCSP
        {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
 #endif
+       {FUNC_TYPE_GENERAL,"prime",prime_main},
+       {FUNC_TYPE_GENERAL,"ts",ts_main},
 #ifndef OPENSSL_NO_SRP
        {FUNC_TYPE_GENERAL,"srp",srp_main},
 #endif
-       {FUNC_TYPE_GENERAL,"prime",prime_main},
-       {FUNC_TYPE_GENERAL,"ts",ts_main},
 #ifndef OPENSSL_NO_MD2
        {FUNC_TYPE_MD,"md2",dgst_main},
 #endif

diff --git a/apps/progs.pl b/apps/progs.pl
index de6fdeabbd63a495773af80d41de3b9c4217528e..39ca8f71fbbc10857ddfc1a885fd21348cca8a91 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -51,6 +51,8 @@ foreach (@ARGV)
                { print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
        elsif ( ($_ =~ /^ocsp$/))
                { print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
+       elsif ( ($_ =~ /^srp$/))
+               { print "#ifndef OPENSSL_NO_SRP\n${str}#endif\n"; }
        else
                { print $str; }
        }

diff --git a/apps/s_server.c b/apps/s_server.c
index dbb35013de1ce26792b7c7c6ad3bdaa0bb4436f0..5e3e4ac27ad3e9f34b5a79fd552c609c9156b3a3 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2245,6 +2245,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");
@@ -2255,6 +2256,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:
@@ -2302,6 +2304,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");
@@ -2312,6 +2315,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:
@@ -2389,6 +2393,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);
@@ -2399,6 +2404,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))
@@ -2623,6 +2629,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);
@@ -2633,7 +2640,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: