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

Make SRP work with -www

Browse Source 
PR#3817

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 4e7e623012e1604d985e2ef362c2957d464f3f01)
This commit is contained in:
Dr. Stephen Henson 2015-09-12 02:37:48 +01:00
parent 8748519f64
commit 2e3a21e152
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
apps/s_server.c
View File

@ -2887,6 +2887,21 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context)
goto err; goto err;
} else { } else {
BIO_printf(bio_s_out, "read R BLOCK\n"); BIO_printf(bio_s_out, "read R BLOCK\n");
#ifndef OPENSSL_NO_SRP
if (BIO_should_io_special(io)
&& BIO_get_retry_reason(io) == BIO_RR_SSL_X509_LOOKUP) {
BIO_printf(bio_s_out, "LOOKUP renego during read\n");
srp_callback_parm.user =
SRP_VBASE_get_by_user(srp_callback_parm.vb,
srp_callback_parm.login);
if (srp_callback_parm.user)
BIO_printf(bio_s_out, "LOOKUP done %s\n",
srp_callback_parm.user->info);
else
BIO_printf(bio_s_out, "LOOKUP not successful\n");
continue;
}
#endif
#if defined(OPENSSL_SYS_NETWARE) #if defined(OPENSSL_SYS_NETWARE)
delay(1000); delay(1000);
#elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__) #elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__)
@ -3217,6 +3232,21 @@ static int rev_body(char *hostname, int s, int stype, unsigned char *context)
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
goto end; goto end;
} }
#ifndef OPENSSL_NO_SRP
if (BIO_should_io_special(io)
&& BIO_get_retry_reason(io) == BIO_RR_SSL_X509_LOOKUP) {
BIO_printf(bio_s_out, "LOOKUP renego during accept\n");
srp_callback_parm.user =
SRP_VBASE_get_by_user(srp_callback_parm.vb,
srp_callback_parm.login);
if (srp_callback_parm.user)
BIO_printf(bio_s_out, "LOOKUP done %s\n",
srp_callback_parm.user->info);
else
BIO_printf(bio_s_out, "LOOKUP not successful\n");
continue;
}
#endif
} }
BIO_printf(bio_err, "CONNECTION ESTABLISHED\n"); BIO_printf(bio_err, "CONNECTION ESTABLISHED\n");
print_ssl_summary(bio_err, con); print_ssl_summary(bio_err, con);
@ -3230,6 +3260,21 @@ static int rev_body(char *hostname, int s, int stype, unsigned char *context)
goto err; goto err;
} else { } else {
BIO_printf(bio_s_out, "read R BLOCK\n"); BIO_printf(bio_s_out, "read R BLOCK\n");
#ifndef OPENSSL_NO_SRP
if (BIO_should_io_special(io)
&& BIO_get_retry_reason(io) == BIO_RR_SSL_X509_LOOKUP) {
BIO_printf(bio_s_out, "LOOKUP renego during read\n");
srp_callback_parm.user =
SRP_VBASE_get_by_user(srp_callback_parm.vb,
srp_callback_parm.login);
if (srp_callback_parm.user)
BIO_printf(bio_s_out, "LOOKUP done %s\n",
srp_callback_parm.user->info);
else
BIO_printf(bio_s_out, "LOOKUP not successful\n");
continue;
}
#endif
#if defined(OPENSSL_SYS_NETWARE) #if defined(OPENSSL_SYS_NETWARE)
delay(1000); delay(1000);
#elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__) #elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__)