summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/curl
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-24 16:23:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-24 16:24:55 +0000
commit33e95afc83f244fe182a36b90affaf7d211bd6b6 (patch)
tree96c2e23080252b3ad65769f03cdb13e59ea5ce89 /meta/recipes-support/curl
parent9bfb78bff606700176909abaa5cf8a332292738a (diff)
downloadpoky-33e95afc83f244fe182a36b90affaf7d211bd6b6.tar.gz
curl: Fixup line ending merge issues
Somehow the patch line endings got messed up during merge. This restores the delta. (From OE-Core rev: 5dee4e241d64e6144d74967cca583d249689773a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/curl')
-rw-r--r--meta/recipes-support/curl/curl/CVE-2014-3613.patch18
-rw-r--r--meta/recipes-support/curl/curl/CVE-2014-3620.patch14
2 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-support/curl/curl/CVE-2014-3613.patch b/meta/recipes-support/curl/curl/CVE-2014-3613.patch
index e517949703..3e2fee0413 100644
--- a/meta/recipes-support/curl/curl/CVE-2014-3613.patch
+++ b/meta/recipes-support/curl/curl/CVE-2014-3613.patch
@@ -170,15 +170,15 @@ index 38af83b..dfcac04 100644
170--- a/tests/data/test31 170--- a/tests/data/test31
171+++ b/tests/data/test31 171+++ b/tests/data/test31
172@@ -49,11 +49,12 @@ Set-Cookie: nodomainnovalue 172@@ -49,11 +49,12 @@ Set-Cookie: nodomainnovalue
173 Set-Cookie: nodomain=value; expires=Fri Feb 2 11:56:27 GMT 2035 173 Set-Cookie: nodomain=value; expires=Fri Feb 2 11:56:27 GMT 2035
174 Set-Cookie: novalue; domain=reallysilly 174 Set-Cookie: novalue; domain=reallysilly
175 Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030 175 Set-Cookie: test=yes; domain=foo.com; expires=Sat Feb 2 11:56:27 GMT 2030
176 Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030 176 Set-Cookie: test2=yes; domain=se; expires=Sat Feb 2 11:56:27 GMT 2030
177 Set-Cookie: magic=yessir; path=/silly/; HttpOnly 177 Set-Cookie: magic=yessir; path=/silly/; HttpOnly
178-Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad; 178-Set-Cookie: blexp=yesyes; domain=.0.0.1; domain=.0.0.1; expiry=totally bad;
179+Set-Cookie: blexp=yesyes; domain=127.0.0.1; domain=127.0.0.1; expiry=totally bad; 179+Set-Cookie: blexp=yesyes; domain=127.0.0.1; domain=127.0.0.1; expiry=totally bad;
180+Set-Cookie: partialip=nono; domain=.0.0.1; 180+Set-Cookie: partialip=nono; domain=.0.0.1;
181 181
182 boo 182 boo
183 </data> 183 </data>
184 </reply> 184 </reply>
diff --git a/meta/recipes-support/curl/curl/CVE-2014-3620.patch b/meta/recipes-support/curl/curl/CVE-2014-3620.patch
index 0ddefecdbd..d11f1908af 100644
--- a/meta/recipes-support/curl/curl/CVE-2014-3620.patch
+++ b/meta/recipes-support/curl/curl/CVE-2014-3620.patch
@@ -53,14 +53,14 @@ index d2de279..e6dbbb9 100644
53--- a/tests/data/test61 53--- a/tests/data/test61
54+++ b/tests/data/test61 54+++ b/tests/data/test61
55@@ -21,10 +21,11 @@ Set-Cookie: test=yes; httponly; domain=foo.com; expires=Fri Feb 2 11:56:27 GMT 2 55@@ -21,10 +21,11 @@ Set-Cookie: test=yes; httponly; domain=foo.com; expires=Fri Feb 2 11:56:27 GMT 2
56 SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 2 11:56:27 GMT 2035 56 SET-COOKIE: test2=yes; domain=host.foo.com; expires=Fri Feb 2 11:56:27 GMT 2035
57 Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure 57 Set-Cookie: test3=maybe; domain=foo.com; path=/moo; secure
58 Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure 58 Set-Cookie: test4=no; domain=nope.foo.com; path=/moo; secure
59 Set-Cookie: test5=name; domain=anything.com; path=/ ; secure 59 Set-Cookie: test5=name; domain=anything.com; path=/ ; secure
60 Set-Cookie: fake=fooledyou; domain=..com; path=/; 60 Set-Cookie: fake=fooledyou; domain=..com; path=/;
61+Set-Cookie: supercookie=fooledyou; domain=.com; path=/;^M 61+Set-Cookie: supercookie=fooledyou; domain=.com; path=/;^M
62 Content-Length: 4 62 Content-Length: 4
63 63
64 boo 64 boo
65 </data> 65 </data>
66 </reply> 66 </reply>