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.

diff --git a/docs/curl.1 b/docs/curl.1
index 51680315f9bf52d062db1a01fbe60da1f8cadc81..c455b897fbc6cbe00abf87a17a4ec54ac94512fc 100644 (file)
--- a/docs/curl.1
+++ b/docs/curl.1
@@ -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)

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index 3d254e1b5071b0381847efe088623fe09c7255f8..5b6f3bec9ef2c93f18625229cf0fe00219943765 100644 (file)
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -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;
       }

diff --git a/src/tool_help.c b/src/tool_help.c
index 992a969ce9d6efdf1baee3b1d702b56d1690e992..978d8b6014e043caadd6c71cd5483f3c7cee26e4 100644 (file)
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -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",