The branch OpenSSL_1_0_1-stable has been updated via 34a0eade7ffea9c73b59e0fdffd4e1148b47b5ee (commit) via 2bc914eb29a266d16d6046ae64d153c033ff333f (commit) from 2ab1e7fde35f8f2b9e6eff523f5618a6eaac03f2 (commit)
- Log ----------------------------------------------------------------- commit 34a0eade7ffea9c73b59e0fdffd4e1148b47b5ee Author: Dr. Stephen Henson <st...@openssl.org> Date: Sat Sep 12 02:37:48 2015 +0100 Make SRP work with -www PR#3817 Reviewed-by: Rich Salz <rs...@openssl.org> (cherry picked from commit 4e7e623012e1604d985e2ef362c2957d464f3f01) Conflicts: apps/s_server.c commit 2bc914eb29a266d16d6046ae64d153c033ff333f Author: Dr. Stephen Henson <st...@openssl.org> Date: Sun Sep 13 19:04:58 2015 +0100 Handle SSL_ERROR_WANT_X509_LOOKUP Reviewed-by: Rich Salz <rs...@openssl.org> (cherry picked from commit f1c412c9e63f7c9cac2c723bff09cce563dda1b0) ----------------------------------------------------------------------- Summary of changes: apps/s_server.c | 15 +++++++++++++++ ssl/bio_ssl.c | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/apps/s_server.c b/apps/s_server.c index b58e5e0..a8aee77 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__) diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c index a0c583e..d2d4d2e 100644 --- a/ssl/bio_ssl.c +++ b/ssl/bio_ssl.c @@ -419,6 +419,10 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr) BIO_set_flags(b, BIO_FLAGS_IO_SPECIAL | BIO_FLAGS_SHOULD_RETRY); b->retry_reason = b->next_bio->retry_reason; break; + case SSL_ERROR_WANT_X509_LOOKUP: + BIO_set_retry_special(b); + b->retry_reason = BIO_RR_SSL_X509_LOOKUP; + break; default: break; } _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits