diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-12 02:37:48 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-09-20 14:28:22 +0100 |
| commit | 34a0eade7ffea9c73b59e0fdffd4e1148b47b5ee (patch) | |
| tree | 89d5400c580fa4ba5f4edd831c8e8da45b6cd9fc /apps | |
| parent | 2bc914eb29a266d16d6046ae64d153c033ff333f (diff) | |
Make SRP work with -www
PR#3817
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 4e7e623012e1604d985e2ef362c2957d464f3f01)
Conflicts:
apps/s_server.c
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_server.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index b58e5e07c4..a8aee77a6e 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -2654,6 +2654,21 @@ static int www_body(char *hostname, int s, unsigned char *context) goto err; } else { 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) delay(1000); #elif !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__) |