Commit 720ea577 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

curl: remove --proxy-ssl* options 

There's mostly likely no need to allow setting SSLv2/3 version for HTTPS
proxy. Those protocols are insecure by design and deprecated.
parent c67f8420

docs/curl.1

+0 −6
Original line number Diff line number Diff line
@@ -1513,12 +1513,6 @@ sockd/proxy-name. (Added in 7.43.0). 
.IP "--proxy-ssl-allow-beast"

(SSL) Same as \fI--ssl-allow-beast\fP but used in HTTPS proxy context.

(Added in 7.52.0)

.IP "--proxy-sslv2"

(SSL) Same as \fI--sslv2\fP but used in HTTPS proxy context.

(Added in 7.52.0)

.IP "--proxy-sslv3"

(SSL) Same as \fI--sslv3\fP but used in HTTPS proxy context.

(Added in 7.52.0)

.IP "--proxy-tlsauthtype <authtype>"

Same as \fI--tlsauthtype\fP but used in HTTPS proxy context.

(Added in 7.52.0)

src/tool_getparam.c

+0 −12
Original line number Diff line number Diff line
@@ -246,8 +246,6 @@ static const struct LongShort aliases[]= { 
  {"E7", "proxy-capath",             TRUE},

  {"E8", "proxy-insecure",           FALSE},

  {"E9", "proxy-tlsv1",              FALSE},

  {"EA", "proxy-sslv2",              FALSE},

  {"EB", "proxy-sslv3",              FALSE},

  {"f",  "fail",                     FALSE},

  {"fa", "fail-early",               FALSE},

  {"F",  "form",                     TRUE},
@@ -1542,16 +1540,6 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ 
        config->proxy_ssl_version = CURL_SSLVERSION_TLSv1;

        break;



      case 'A':

        /* SSL version 2 for proxy */

        config->proxy_ssl_version = CURL_SSLVERSION_SSLv2;

        break;



      case 'B':

        /* SSL version 3 for proxy */

        config->proxy_ssl_version = CURL_SSLVERSION_SSLv3;

        break;



      default: /* unknown flag */

        return PARAM_OPTION_UNKNOWN;

      }

src/tool_help.c

+0 −2
Original line number Diff line number Diff line
@@ -199,8 +199,6 @@ static const char *const helptext[] = { 
  "     --proxy-pass PASS Pass phrase for the private key for proxy (SSL)",

  "     --proxy-ssl-allow-beast "

  "Allow security flaw to improve interop for proxy (SSL)",

  "     --proxy-sslv2   Use SSLv2 for proxy (SSL)",

  "     --proxy-sslv3   Use SSLv3 for proxy (SSL)",

  "     --proxy-tlsv1   Use TLSv1 for proxy (SSL)",

  "     --proxy-tlsuser USER TLS username for proxy",

  "     --proxy-tlspassword STRING TLS password for proxy",