[packages_10.03.2] curl: merge r29771, r29775, r29787, r29841

[10.03/packages.git] / libs / curl / patches / 510-no_sslv2.patch

diff --git a/libs/curl/patches/510-no_sslv2.patch b/libs/curl/patches/510-no_sslv2.patch
deleted file mode 100644 (file)
index 4866b37..0000000
--- a/libs/curl/patches/510-no_sslv2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/main.c
-+++ b/src/main.c
-@@ -936,7 +936,9 @@ static void help(void)
-     "Time needed to trig speed-limit abort. Defaults to 30",
-     "    --ssl           Try SSL/TLS (FTP, IMAP, POP3, SMTP)",
-     "    --ssl-reqd      Require SSL/TLS (FTP, IMAP, POP3, SMTP)",
-+#ifndef OPENSSL_NO_SSL2
-     " -2/--sslv2         Use SSLv2 (SSL)",
-+#endif
-     " -3/--sslv3         Use SSLv3 (SSL)",
-     "    --stderr <file> Where to redirect stderr. - means stdout",
-     "    --tcp-nodelay   Use the TCP_NODELAY option",
-@@ -2535,10 +2537,12 @@ static ParameterError getparameter(char 
-       /* TLS version 1 */
-       config->ssl_version = CURL_SSLVERSION_TLSv1;
-       break;
-+#ifndef OPENSSL_NO_SSL2
-     case '2':
-       /* SSL version 2 */
-       config->ssl_version = CURL_SSLVERSION_SSLv2;
-       break;
-+#endif
-     case '3':
-       /* SSL version 3 */
-       config->ssl_version = CURL_SSLVERSION_SSLv3;