[packages_10.03.1] curl: update to v7.21.7 (CVE-2011-2192)

[openwrt/svn-archive/archive.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
index d6d4dbf676ce80ea7de43c757f9fc2a469839281..4866b37c6c8cce12fa8f8f63e6fcd0cb191e0227 100644 (file)
--- a/libs/curl/patches/510-no_sslv2.patch
+++ b/libs/curl/patches/510-no_sslv2.patch
@@ -1,32 +1,16 @@
-diff -ruN curl-7.14.0-old/lib/ssluse.c curl-7.14.0-new/lib/ssluse.c
---- curl-7.14.0-old/lib/ssluse.c       2005-04-15 00:52:57.000000000 +0200
-+++ curl-7.14.0-new/lib/ssluse.c       2006-12-18 10:48:20.000000000 +0100
-@@ -1144,9 +1144,11 @@
-   case CURL_SSLVERSION_TLSv1:
-     req_method = TLSv1_client_method();
-     break;
-+#ifndef OPENSSL_NO_SSL2
-   case CURL_SSLVERSION_SSLv2:
-     req_method = SSLv2_client_method();
-     break;
-+#endif
-   case CURL_SSLVERSION_SSLv3:
-     req_method = SSLv3_client_method();
-     break;
-diff -ruN curl-7.14.0-old/src/main.c curl-7.14.0-new/src/main.c
---- curl-7.14.0-old/src/main.c 2005-05-12 09:28:03.000000000 +0200
-+++ curl-7.14.0-new/src/main.c 2006-12-18 10:47:48.000000000 +0100
-@@ -425,7 +425,9 @@
-     " -z/--time-cond <time> Transfer based on a time condition",
-     " -0/--http1.0       Use HTTP 1.0 (H)",
-     " -1/--tlsv1         Use TLSv1 (SSL)",
+--- 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)",
-     "    --3p-quote      like -Q for the source URL for 3rd party transfer (F)",
-     "    --3p-url        source URL to activate 3rd party transfer (F)",
-@@ -1671,10 +1673,12 @@
+     "    --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;