1 files changed, 54 insertions, 38 deletions

diff --git a/libs/libcurl/src/vtls/vtls.c b/libs/libcurl/src/vtls/vtls.c
index f37907c494..6deb512879 100644
--- a/libs/libcurl/src/vtls/vtls.c
+++ b/libs/libcurl/src/vtls/vtls.c
@@ -883,28 +883,21 @@ CURLcode Curl_ssl_push_certinfo_len(struct Curl_easy *data,
                                     size_t valuelen)

 {

   struct curl_certinfo *ci = &data->info.certs;

-  char *output;

   struct curl_slist *nl;

   CURLcode result = CURLE_OK;

-  size_t labellen = strlen(label);

-  size_t outlen = labellen + 1 + valuelen + 1; /* label:value\0 */

+  struct dynbuf build;

 

-  output = malloc(outlen);

-  if(!output)

-    return CURLE_OUT_OF_MEMORY;

-

-  /* sprintf the label and colon */

-  msnprintf(output, outlen, "%s:", label);

+  Curl_dyn_init(&build, 10000);

 

-  /* memcpy the value (it might not be null-terminated) */

-  memcpy(&output[labellen + 1], value, valuelen);

-

-  /* null-terminate the output */

-  output[labellen + 1 + valuelen] = 0;

+  if(Curl_dyn_add(&build, label) ||

+     Curl_dyn_addn(&build, ":", 1) ||

+     Curl_dyn_addn(&build, value, valuelen))

+    return CURLE_OUT_OF_MEMORY;

 

-  nl = Curl_slist_append_nodup(ci->certinfo[certnum], output);

+  nl = Curl_slist_append_nodup(ci->certinfo[certnum],

+                               Curl_dyn_ptr(&build));

   if(!nl) {

-    free(output);

+    Curl_dyn_free(&build);

     curl_slist_free_all(ci->certinfo[certnum]);

     result = CURLE_OUT_OF_MEMORY;

   }

@@ -1002,7 +995,7 @@ CURLcode Curl_pin_peer_pubkey(struct Curl_easy *data,
   /* only do this if pinnedpubkey starts with "sha256//", length 8 */

   if(strncmp(pinnedpubkey, "sha256//", 8) == 0) {

     CURLcode encode;

-    size_t encodedlen = 0, pinkeylen;

+    size_t encodedlen = 0;

     char *encoded = NULL, *pinkeycopy, *begin_pos, *end_pos;

     unsigned char *sha256sumdigest;

 

@@ -1030,13 +1023,11 @@ CURLcode Curl_pin_peer_pubkey(struct Curl_easy *data,
     infof(data, " public key hash: sha256//%s", encoded);

 

     /* it starts with sha256//, copy so we can modify it */

-    pinkeylen = strlen(pinnedpubkey) + 1;

-    pinkeycopy = malloc(pinkeylen);

+    pinkeycopy = strdup(pinnedpubkey);

     if(!pinkeycopy) {

       Curl_safefree(encoded);

       return CURLE_OUT_OF_MEMORY;

     }

-    memcpy(pinkeycopy, pinnedpubkey, pinkeylen);

     /* point begin_pos to the copy, and start extracting keys */

     begin_pos = pinkeycopy;

     do {

@@ -1422,17 +1413,13 @@ static size_t multissl_version(char *buffer, size_t size)
     backends_len = p - backends;

   }

 

-  if(!size)

-    return 0;

-

-  if(size <= backends_len) {

-    strncpy(buffer, backends, size - 1);

-    buffer[size - 1] = '\0';

-    return size - 1;

+  if(size) {

+    if(backends_len < size)

+      strcpy(buffer, backends);

+    else

+      *buffer = 0; /* did not fit */

   }

-

-  strcpy(buffer, backends);

-  return backends_len;

+  return 0;

 }

 

 static int multissl_setup(const struct Curl_ssl *backend)

@@ -1728,18 +1715,34 @@ static ssize_t ssl_cf_recv(struct Curl_cfilter *cf,
 {

   struct cf_call_data save;

   ssize_t nread;

+  size_t ntotal = 0;

 

   CF_DATA_SAVE(save, cf, data);

   *err = CURLE_OK;

-  nread = Curl_ssl->recv_plain(cf, data, buf, len, err);

-  if(nread > 0) {

-    DEBUGASSERT((size_t)nread <= len);

-  }

-  else if(nread == 0) {

-    /* eof */

+  /* Do receive until we fill the buffer somehwhat or EGAIN, error or EOF */

+  while(!ntotal || (len - ntotal) > (4*1024)) {

     *err = CURLE_OK;

+    nread = Curl_ssl->recv_plain(cf, data, buf + ntotal, len - ntotal, err);

+    if(nread < 0) {

+      if(*err == CURLE_AGAIN && ntotal > 0) {

+        /* we EAGAINed after having reed data, return the success amount */

+        *err = CURLE_OK;

+        break;

+      }

+      /* we have a an error to report */

+      goto out;

+    }

+    else if(nread == 0) {

+      /* eof */

+      break;

+    }

+    ntotal += (size_t)nread;

+    DEBUGASSERT((size_t)ntotal <= len);

   }

-  CURL_TRC_CF(data, cf, "cf_recv(len=%zu) -> %zd, %d", len, nread, *err);

+  nread = (ssize_t)ntotal;

+out:

+  CURL_TRC_CF(data, cf, "cf_recv(len=%zu) -> %zd, %d", len,

+              nread, *err);

   CF_DATA_RESTORE(cf, save);

   return nread;

 }

@@ -1855,6 +1858,8 @@ struct Curl_cftype Curl_cft_ssl = {
   ssl_cf_query,

 };

 

+#ifndef CURL_DISABLE_PROXY

+

 struct Curl_cftype Curl_cft_ssl_proxy = {

   "SSL-PROXY",

   CF_TYPE_SSL,

@@ -1873,6 +1878,8 @@ struct Curl_cftype Curl_cft_ssl_proxy = {
   Curl_cf_def_query,

 };

 

+#endif /* !CURL_DISABLE_PROXY */

+

 static CURLcode cf_ssl_create(struct Curl_cfilter **pcf,

                               struct Curl_easy *data,

                               struct connectdata *conn)

@@ -1980,8 +1987,12 @@ bool Curl_ssl_supports(struct Curl_easy *data, int option)
 static struct Curl_cfilter *get_ssl_filter(struct Curl_cfilter *cf)

 {

   for(; cf; cf = cf->next) {

-    if(cf->cft == &Curl_cft_ssl || cf->cft == &Curl_cft_ssl_proxy)

+    if(cf->cft == &Curl_cft_ssl)

+      return cf;

+#ifndef CURL_DISABLE_PROXY

+    if(cf->cft == &Curl_cft_ssl_proxy)

       return cf;

+#endif

   }

   return NULL;

 }

@@ -2027,7 +2038,12 @@ CURLcode Curl_ssl_cfilter_remove(struct Curl_easy *data,
 

 bool Curl_ssl_cf_is_proxy(struct Curl_cfilter *cf)

 {

+#ifndef CURL_DISABLE_PROXY

   return (cf->cft == &Curl_cft_ssl_proxy);

+#else

+  (void)cf;

+  return FALSE;

+#endif

 }

 

 struct ssl_config_data *