tree 6043bc8fa7e3dc272efeae8d8594076ee5f30d25
parent de56f726e163e99128ff93a04d74a8461f5a724b
author Vita Batrla <vitezslav.batrla@oracle.com> 1647637370 +0100
committer Tomas Mraz <tomas@openssl.org> 1651750583 +0200

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)