[openssl/openssl] 2ff09a: s_client -proxy / -starttls shouldn't be mutually ...

[Tomas Mraz]

  Branch: refs/heads/openssl-3.0
  Home:   https://github.openssl.org/openssl/openssl
  Commit: 2ff09a3f7b875a9f4367c1fb2d0e24fa51dd7674
      https://github.openssl.org/openssl/openssl/commit/2ff09a3f7b875a9f4367c1fb2d0e24fa51dd7674
  Author: Vita Batrla <vitezslav.batrla at oracle.com>
  Date:   2022-05-05 (Thu, 05 May 2022)

  Changed paths:
    M apps/s_client.c

  Log Message:
  -----------
  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 at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17925)

(cherry picked from commit 802cacf34f2db9111becb4f0d3aa00460df13a19)