diff options
author | Vita Batrla <vitezslav.batrla@oracle.com> | 2022-03-18 22:02:50 +0100 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2022-05-05 13:37:54 +0200 |
commit | 2ff09a3f7b875a9f4367c1fb2d0e24fa51dd7674 (patch) | |
tree | 3b7e4a3c8788c395c5f20f396b3e4e92641cfbfe /crypto | |
parent | 9ddab6a008c6614f7858d5ae971a7e4afc19ca15 (diff) |
s_client -proxy / -starttls shouldn't be mutually exclusive
The option -proxy of openssl s_client works fine. The option
-starttls also works fine. However, try putting both of them
on command line. It breaks, these options don't work together.
The problem is that -proxy option is implemented using starttls_proto
(the option parsing code sets it to PROTO_CONNECT) and -starttls option
overwrites the same variable again based on argument value.
The suggested fix is to independently handle -proxy option before
-starttls so the s_client can connect through HTTP proxy server and
then use STARTTLS command.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17925)
(cherry picked from commit 802cacf34f2db9111becb4f0d3aa00460df13a19)
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions