new file mode 100644

@@ -0,0 +1,39 @@

+From b780b30d1377adb10bbe774835f49e9b237fb9bb Mon Sep 17 00:00:00 2001

+From: Daniel Stenberg <daniel@haxx.se>

+Date: Wed, 2 Jan 2019 20:33:08 +0100

+Subject: [PATCH] NTLM: fix size check condition for type2 received data

+

+Bug: https://curl.haxx.se/docs/CVE-2018-16890.html

+Reported-by: Wenxiang Qian

+CVE-2018-16890

+---

+ lib/vauth/ntlm.c | 7 ++++---

+ 1 file changed, 4 insertions(+), 3 deletions(-)

+

+diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c

+index c3d55ed251..0ad4d972e3 100644

+--- a/lib/vauth/ntlm.c

+@@ -5,7 +5,7 @@

+  *                            | (__| |_| |  _ <| |___

+  *                             \___|\___/|_| \_\_____|

+  *

+- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

++ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

+  *

+  * This software is licensed as described in the file COPYING, which

+  * you should have received as part of this distribution. The terms

+@@ -182,10 +182,11 @@ static CURLcode ntlm_decode_type2_target(struct Curl_easy *data,

+     target_info_len = Curl_read16_le(&buffer[40]);

+     target_info_offset = Curl_read32_le(&buffer[44]);

+     if(target_info_len > 0) {

+-      if(((target_info_offset + target_info_len) > size) ||

++      if((target_info_offset >= size) ||

++         ((target_info_offset + target_info_len) > size) ||

+          (target_info_offset < 48)) {

+         infof(data, "NTLM handshake failure (bad type-2 message). "

+-                    "Target Info Offset Len is set incorrect by the peer\n");

++              "Target Info Offset Len is set incorrect by the peer\n");

+         return CURLE_BAD_CONTENT_ENCODING;

+       }

+ 

new file mode 100644

@@ -0,0 +1,35 @@

+From 50c9484278c63b958655a717844f0721263939cc Mon Sep 17 00:00:00 2001

+From: Daniel Stenberg <daniel@haxx.se>

+Date: Thu, 3 Jan 2019 12:59:28 +0100

+Subject: [PATCH] ntlm: fix *_type3_message size check to avoid buffer overflow

+

+Bug: https://curl.haxx.se/docs/CVE-2019-3822.html

+Reported-by: Wenxiang Qian

+CVE-2019-3822

+---

+ lib/vauth/ntlm.c | 11 +++++++----

+ 1 file changed, 7 insertions(+), 4 deletions(-)

+

+diff --git a/lib/vauth/ntlm.c b/lib/vauth/ntlm.c

+index 0ad4d972e3..6a8fc5ab3d 100644

+--- a/lib/vauth/ntlm.c

+@@ -779,11 +779,14 @@ CURLcode Curl_auth_create_ntlm_type3_message(struct Curl_easy *data,

+   });

+ 

+ #ifdef USE_NTRESPONSES

+-  if(size < (NTLM_BUFSIZE - ntresplen)) {

+-    DEBUGASSERT(size == (size_t)ntrespoff);

+-    memcpy(&ntlmbuf[size], ptr_ntresp, ntresplen);

+-    size += ntresplen;

++  /* ntresplen + size should not be risking an integer overflow here */

++  if(ntresplen + size > sizeof(ntlmbuf)) {

++    failf(data, "incoming NTLM message too big");

++    return CURLE_OUT_OF_MEMORY;

+   }

++  DEBUGASSERT(size == (size_t)ntrespoff);

++  memcpy(&ntlmbuf[size], ptr_ntresp, ntresplen);

++  size += ntresplen;

+ 

+   DEBUG_OUT({

+     fprintf(stderr, "\n   ntresp=");

new file mode 100644

@@ -0,0 +1,44 @@

+From 39df4073e5413fcdbb5a38da0c1ce6f1c0ceb484 Mon Sep 17 00:00:00 2001

+From: Daniel Gustafsson <daniel@yesql.se>

+Date: Sat, 19 Jan 2019 00:42:47 +0100

+Subject: [PATCH] smtp: avoid risk of buffer overflow in strtol

+

+If the incoming len 5, but the buffer does not have a termination

+after 5 bytes, the strtol() call may keep reading through the line

+buffer until is exceeds its boundary. Fix by ensuring that we are

+using a bounded read with a temporary buffer on the stack.

+

+Bug: https://curl.haxx.se/docs/CVE-2019-3823.html

+Reported-by: Brian Carpenter (Geeknik Labs)

+CVE-2019-3823

+---

+ lib/smtp.c | 8 ++++++--

+ 1 file changed, 6 insertions(+), 2 deletions(-)

+

+diff --git a/lib/smtp.c b/lib/smtp.c

+index 84fc68e418..d55647b12e 100644

+--- a/lib/smtp.c

+@@ -5,7 +5,7 @@

+  *                            | (__| |_| |  _ <| |___

+  *                             \___|\___/|_| \_\_____|

+  *

+- * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

++ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.

+  *

+  * This software is licensed as described in the file COPYING, which

+  * you should have received as part of this distribution. The terms

+@@ -207,8 +207,12 @@ static bool smtp_endofresp(struct connectdata *conn, char *line, size_t len,

+      Section 4. Examples of RFC-4954 but some e-mail servers ignore this and

+      only send the response code instead as per Section 4.2. */

+   if(line[3] == ' ' || len == 5) {

++    char tmpline[6];

++

+     result = TRUE;

+-    *resp = curlx_sltosi(strtol(line, NULL, 10));

++    memset(tmpline, '\0', sizeof(tmpline));

++    memcpy(tmpline, line, (len == 5 ? 5 : 3));

++    *resp = curlx_sltosi(strtol(tmpline, NULL, 10));

+ 

+     /* Make sure real server never sends internal value */

+     if(*resp == 1)

@@ -1,7 +1,7 @@

 Summary:        An URL retrieval utility and library

 Name:           curl

 Version:        7.61.1

-Release:        2%{?dist}

+Release:        3%{?dist}

 License:        MIT

 URL:            http://curl.haxx.se

 Group:          System Environment/NetworkingLibraries

@@ -12,6 +12,9 @@ Source0:        http://curl.haxx.se/download/%{name}-%{version}.tar.gz

 Patch0:         CVE-2018-16839.patch

 Patch1:         CVE-2018-16840.patch

 Patch2:         CVE-2018-16842.patch

+Patch3:         curl-CVE-2018-16890.patch

+Patch4:         curl-CVE-2019-3822.patch

+Patch5:         curl-CVE-2019-3823.patch

 BuildRequires:  ca-certificates

 BuildRequires:  openssl-devel

 BuildRequires:  krb5-devel

@@ -47,6 +50,9 @@ This package contains minimal set of shared curl libraries.

 %patch0 -p1

 %patch1 -p1

 %patch2 -p1

+%patch3 -p1

+%patch4 -p1

+%patch5 -p1

 %build

 %configure \

@@ -95,6 +101,8 @@ rm -rf %{buildroot}/*

 %{_libdir}/libcurl.so.*

 %changelog

+*   Tue Feb 19 2019 Dweep Advani <dadvani@vmware.com> 7.61.1-3

+-   Fixed CVE-2018-16890, CVE-2019-3822 and CVE-2019-3823

 *   Tue Jan 08 2019 Dweep Advani <dadvani@vmware.com> 7.61.1-2

 -   Fix of CVE-2018-16839, CVE-2018-16840 and CVE-2018-16842

 *   Mon Sep 10 2018 Ajay Kaher <akaher@vmware.com> 7.61.1-1