generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 2714

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

Make no-srp work.
This commit is contained in:
Dr. Stephen Henson 2012-02-10 19:44:00 +00:00
parent 8705846710
commit 508bd3d1aa
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/progs.h
View File

@ -44,9 +44,9 @@ extern int smime_main(int argc,char *argv[]);
extern int rand_main(int argc,char *argv[]); extern int rand_main(int argc,char *argv[]);
extern int engine_main(int argc,char *argv[]); extern int engine_main(int argc,char *argv[]);
extern int ocsp_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 prime_main(int argc,char *argv[]);
extern int ts_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_GENERAL 1
#define FUNC_TYPE_MD 2 #define FUNC_TYPE_MD 2
@ -146,11 +146,11 @@ FUNCTION functions[] = {
#ifndef OPENSSL_NO_OCSP #ifndef OPENSSL_NO_OCSP
{FUNC_TYPE_GENERAL,"ocsp",ocsp_main}, {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
#endif #endif
{FUNC_TYPE_GENERAL,"prime",prime_main},
{FUNC_TYPE_GENERAL,"ts",ts_main},
#ifndef OPENSSL_NO_SRP #ifndef OPENSSL_NO_SRP
{FUNC_TYPE_GENERAL,"srp",srp_main}, {FUNC_TYPE_GENERAL,"srp",srp_main},
#endif #endif
{FUNC_TYPE_GENERAL,"prime",prime_main},
{FUNC_TYPE_GENERAL,"ts",ts_main},
#ifndef OPENSSL_NO_MD2 #ifndef OPENSSL_NO_MD2
{FUNC_TYPE_MD,"md2",dgst_main}, {FUNC_TYPE_MD,"md2",dgst_main},
#endif #endif

2
apps/progs.pl
View File

@ -51,6 +51,8 @@ foreach (@ARGV)
{ print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; } { print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
elsif ( ($_ =~ /^ocsp$/)) elsif ( ($_ =~ /^ocsp$/))
{ print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; } { print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
elsif ( ($_ =~ /^srp$/))
{ print "#ifndef OPENSSL_NO_SRP\n${str}#endif\n"; }
else else
{ print $str; } { print $str; }
} }

9
apps/s_server.c
View File

@ -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); } } { static count=0; if (++count == 100) { count=0; SSL_renegotiate(con); } }
#endif #endif
k=SSL_write(con,&(buf[l]),(unsigned int)i); k=SSL_write(con,&(buf[l]),(unsigned int)i);
#ifndef OPENSSL_NO_SRP
while (SSL_get_error(con,k) == SSL_ERROR_WANT_X509_LOOKUP) while (SSL_get_error(con,k) == SSL_ERROR_WANT_X509_LOOKUP)
{ {
BIO_printf(bio_s_out,"LOOKUP renego during write\n"); 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"); BIO_printf(bio_s_out,"LOOKUP not successful\n");
k=SSL_write(con,&(buf[l]),(unsigned int)i); k=SSL_write(con,&(buf[l]),(unsigned int)i);
} }
#endif
switch (SSL_get_error(con,k)) switch (SSL_get_error(con,k))
{ {
case SSL_ERROR_NONE: case SSL_ERROR_NONE:
@ -2302,6 +2304,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
{ {
again: again:
i=SSL_read(con,(char *)buf,bufsize); i=SSL_read(con,(char *)buf,bufsize);
#ifndef OPENSSL_NO_SRP
while (SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP) while (SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP)
{ {
BIO_printf(bio_s_out,"LOOKUP renego during read\n"); BIO_printf(bio_s_out,"LOOKUP renego during read\n");
@ -2312,6 +2315,7 @@ again:
BIO_printf(bio_s_out,"LOOKUP not successful\n"); BIO_printf(bio_s_out,"LOOKUP not successful\n");
i=SSL_read(con,(char *)buf,bufsize); i=SSL_read(con,(char *)buf,bufsize);
} }
#endif
switch (SSL_get_error(con,i)) switch (SSL_get_error(con,i))
{ {
case SSL_ERROR_NONE: case SSL_ERROR_NONE:
@ -2389,6 +2393,7 @@ static int init_ssl_connection(SSL *con)
i=SSL_accept(con); i=SSL_accept(con);
#ifndef OPENSSL_NO_SRP
while (i <= 0 && SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP) 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); 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"); BIO_printf(bio_s_out,"LOOKUP not successful\n");
i=SSL_accept(con); i=SSL_accept(con);
} }
#endif
if (i <= 0) if (i <= 0)
{ {
if (BIO_sock_should_retry(i)) if (BIO_sock_should_retry(i))
@ -2623,6 +2629,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
if (hack) if (hack)
{ {
i=SSL_accept(con); i=SSL_accept(con);
#ifndef OPENSSL_NO_SRP
while (i <= 0 && SSL_get_error(con,i) == SSL_ERROR_WANT_X509_LOOKUP) 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); 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"); BIO_printf(bio_s_out,"LOOKUP not successful\n");
i=SSL_accept(con); i=SSL_accept(con);
} }
#endif
switch (SSL_get_error(con,i)) switch (SSL_get_error(con,i))
{ {
case SSL_ERROR_NONE: case SSL_ERROR_NONE: