1 files changed, 0 insertions, 135 deletions

diff --git a/recipes-support/curl/curl/CVE-2017-8817.patch b/recipes-support/curl/curl/CVE-2017-8817.patch
deleted file mode 100644
index e8429b2..0000000
--- a/recipes-support/curl/curl/CVE-2017-8817.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 438a9ebfe9c4dc850ca2ed858bf5b8c31ce15ef5 Mon Sep 17 00:00:00 2001
-From: Sona Sarmadi <sona.sarmadi@enea.com>
-Date: Fri, 2 Mar 2018 08:48:05 +0100
-Subject: [PATCH] curl: fix for CVE-2017-8817
-
-wildcardmatch: fix heap buffer overflow in setcharset
-
-The code would previous read beyond the end of the pattern string if the
-match pattern ends with an open bracket when the default pattern
-matching function is used.
-
-Detected by OSS-Fuzz:
-https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4161
-
-CVE: CVE-2017-8817
-Upstream-Status: Backport [https://curl.haxx.se/CVE-2017-8817.patch]
-
-Bug: https://curl.haxx.se/docs/adv_2017-ae72.html
-
-Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
----
- lib/curl_fnmatch.c      |  9 +++------
- tests/data/Makefile.inc |  2 +-
- tests/data/test1163     | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 56 insertions(+), 7 deletions(-)
- create mode 100644 tests/data/test1163
-
-diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c
-index 46d3ada..5dd5323 100644
---- a/lib/curl_fnmatch.c
-+++ b/lib/curl_fnmatch.c
-@@ -133,6 +133,9 @@ static int setcharset(unsigned char **p, unsigned char *charset)
-   unsigned char c;
-   for(;;) {
-     c = **p;
-+    if(!c)
-+      return SETCHARSET_FAIL;
-+
-     switch(state) {
-     case CURLFNM_SCHS_DEFAULT:
-       if(ISALNUM(c)) { /* ASCII value */
-@@ -196,9 +199,6 @@ static int setcharset(unsigned char **p, unsigned char *charset)
-         else
-           return SETCHARSET_FAIL;
-       }
--      else if(c == '\0') {
--        return SETCHARSET_FAIL;
--      }
-       else {
-         charset[c] = 1;
-         (*p)++;
-@@ -277,9 +277,6 @@ static int setcharset(unsigned char **p, unsigned char *charset)
-       else if(c == ']') {
-         return SETCHARSET_OK;
-       }
--      else if(c == '\0') {
--        return SETCHARSET_FAIL;
--      }
-       else if(ISPRINT(c)) {
-         charset[c] = 1;
-         (*p)++;
-diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
-index 5284654..942f9ee 100644
---- a/tests/data/Makefile.inc
-+++ b/tests/data/Makefile.inc
-@@ -122,7 +122,7 @@ test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \
- test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \
- test1144 test1145 test1146 \
- test1152 \
--\
-+test1163 \
- test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
- test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \
- test1216 test1217 test1218 test1219 \
-diff --git a/tests/data/test1163 b/tests/data/test1163
-new file mode 100644
-index 0000000..3266fa8
---- /dev/null
-+++ b/tests/data/test1163
-@@ -0,0 +1,52 @@
-+<testcase>
-+<info>
-+<keywords>
-+FTP
-+RETR
-+LIST
-+wildcardmatch
-+ftplistparser
-+flaky
-+</keywords>
-+</info>
-+
-+#
-+# Server-side
-+<reply>
-+<data>
-+</data>
-+</reply>
-+
-+# Client-side
-+<client>
-+<server>
-+ftp
-+</server>
-+<tool>
-+lib576
-+</tool>
-+<name>
-+FTP wildcard with pattern ending with an open-bracket
-+</name>
-+<command>
-+"ftp://%HOSTIP:%FTPPORT/fully_simulated/DOS/*[]["
-+</command>
-+</client>
-+<verify>
-+<protocol>
-+USER anonymous
-+PASS ftp@example.com
-+PWD
-+CWD fully_simulated
-+CWD DOS
-+EPSV
-+TYPE A
-+LIST
-+QUIT
-+</protocol>
-+# 78 == CURLE_REMOTE_FILE_NOT_FOUND
-+<errorcode>
-+78
-+</errorcode>
-+</verify>
-+</testcase>
--- 
-1.9.1
-