diff options
| author | dartraiden <wowemuh@gmail.com> | 2019-05-22 15:38:52 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2019-05-22 15:38:52 +0300 |
| commit | 2dc913b65c76e8f51989cc20ce0ce8b1b087db37 (patch) | |
| tree | 6b44ea975bd3fac9562ac10213aa67c1b95da03a /libs/libcurl/src/vtls/polarssl.c | |
| parent | 06eb563066b96fc1c4931f3a5dcf17c4f6fa32c5 (diff) | |
libcurl: update to 7.65
Diffstat (limited to 'libs/libcurl/src/vtls/polarssl.c')
| -rw-r--r-- | libs/libcurl/src/vtls/polarssl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/libcurl/src/vtls/polarssl.c b/libs/libcurl/src/vtls/polarssl.c index 6ecabe94b5..7ea26b4425 100644 --- a/libs/libcurl/src/vtls/polarssl.c +++ b/libs/libcurl/src/vtls/polarssl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2012 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2010 - 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com> * * This software is licensed as described in the file COPYING, which @@ -55,6 +55,7 @@ #include "select.h" #include "strcase.h" #include "polarssl_threadlock.h" +#include "multiif.h" #include "curl_printf.h" #include "curl_memory.h" /* The last #include file should be: */ @@ -593,6 +594,8 @@ polarssl_connect_step2(struct connectdata *conn, } else infof(data, "ALPN, server did not agree to a protocol\n"); + Curl_multiuse_state(conn, conn->negnpn == CURL_HTTP_VERSION_2 ? + BUNDLE_MULTIPLEX : BUNDLE_NO_MULTIUSE); } #endif @@ -908,9 +911,7 @@ const struct Curl_ssl Curl_ssl_polarssl = { Curl_none_check_cxn, /* check_cxn */ Curl_none_shutdown, /* shutdown */ Curl_polarssl_data_pending, /* data_pending */ - /* This might cause libcurl to use a weeker random! - * TODO: use Polarssl's CTR-DRBG or HMAC-DRBG - */ + /* This might cause libcurl to use a weeker random! */ Curl_none_random, /* random */ Curl_none_cert_status_request, /* cert_status_request */ Curl_polarssl_connect, /* connect */ |