From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 24 May 2025 13:40:32 +0000 (+0200)
Subject: getparameter: move --npn, --sslv2 and --sslv3 to generic handler
X-Git-Tag: curl-8_14_0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa00cb08c9f9333a3fde1acfb383c1f7ba1e7d83;p=thirdparty%2Fcurl.git

getparameter: move --npn, --sslv2 and --sslv3 to generic handler

For deprecated options.

Closes #17442
---

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index fd246bfd7a..7354c059be 100644
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -1831,6 +1831,9 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
     case C_RANDOM_FILE: /* --random-file */
     case C_EGD_FILE: /* --egd-file */
     case C_NTLM_WB: /* --ntlm-wb */
+    case C_NPN: /* --npn */
+    case C_SSLV2: /* --sslv2 */
+    case C_SSLV3: /* --sslv3 */
       warnf(global, "--%s is deprecated and has no function anymore",
             a->lname);
       break;
@@ -1898,9 +1901,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
         global->tracetype = TRACE_BIN;
       }
       break;
-    case C_NPN: /* --npn */
-      warnf(global, "--npn is no longer supported");
-      break;
     case C_TRACE_ASCII: /* --trace-ascii */
       err = getstr(&global->trace_dump, nextarg, DENY_BLANK);
       if(!err) {
@@ -2388,12 +2388,6 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
     case C_PROXY_TLS13_CIPHERS: /* --proxy-tls13-ciphers */
       err = getstr(&config->proxy_cipher13_list, nextarg, DENY_BLANK);
       break;
-    case C_SSLV2: /* --sslv2 */
-      warnf(global, "Ignores instruction to use SSLv2");
-      break;
-    case C_SSLV3: /* --sslv3 */
-      warnf(global, "Ignores instruction to use SSLv3");
-      break;
     case C_IPV4: /* --ipv4 */
       config->ip_version = CURL_IPRESOLVE_V4;
       break;