diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2020-05-23 12:52:55 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2020-05-23 12:52:55 +0000 |
| commit | 7723b94e7647f2a791d22c500462d1aa0d5296d7 (patch) | |
| tree | c8d9c7773f05a02cfc8c1e5d6a19efef09c3d069 /usr.bin/openssl/s_client.c | |
| parent | 94daf7f378211abe1442ada5fa801c5aacaae50b (diff) | |
In ssl_lib.c revision 1.217, jsing enabled SSL_MODE_AUTO_RETRY by
default. To avoid hanging on a blocking read, we need to clear the
SSL_MODE_AUTO_RETRY flag in the s_client and the s_server.
ok beck inoguchi jsing
Diffstat (limited to 'usr.bin/openssl/s_client.c')
| -rw-r--r-- | usr.bin/openssl/s_client.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/openssl/s_client.c b/usr.bin/openssl/s_client.c index 88b098286a3..cc886b11e6d 100644 --- a/usr.bin/openssl/s_client.c +++ b/usr.bin/openssl/s_client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s_client.c,v 1.45 2020/05/22 16:11:23 deraadt Exp $ */ +/* $OpenBSD: s_client.c,v 1.46 2020/05/23 12:52:54 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -653,6 +653,9 @@ s_client_main(int argc, char **argv) ERR_print_errors(bio_err); goto end; } + + SSL_CTX_clear_mode(ctx, SSL_MODE_AUTO_RETRY); + if (vpm) SSL_CTX_set1_param(ctx, vpm); |