generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

polarssl: now require 1.3.0+

Browse Source 
Also fixed a function name change in the version requirement bump
This commit is contained in:
Daniel Stenberg 2014-03-17 20:48:06 +01:00
parent 4d6108315b
commit 5017d5ada8
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/INTERNALS
View File

@ -45,6 +45,7 @@ Portability
qsossl V5R3M0 qsossl V5R3M0
NSS 3.14.x NSS 3.14.x
axTLS 1.2.7 axTLS 1.2.7
PolarSSL 1.3.0
Heimdal ? Heimdal ?
On systems where configure runs, we aim at working on them all - if they have On systems where configure runs, we aim at working on them all - if they have

30
lib/vtls/polarssl.c
View File

@ -6,7 +6,7 @@
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 2010 - 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com> * Copyright (C) 2010 - 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com>
* Copyright (C) 2012 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2012 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -38,25 +38,13 @@
#include <polarssl/x509.h> #include <polarssl/x509.h>
#include <polarssl/version.h> #include <polarssl/version.h>
#if POLARSSL_VERSION_NUMBER >= 0x01000000 #if POLARSSL_VERSION_NUMBER < 0x01030000
#include <polarssl/error.h> #error too old PolarSSL
#endif /* POLARSSL_VERSION_NUMBER >= 0x01000000 */ #endif
#if POLARSSL_VERSION_NUMBER>0x01010000 #include <polarssl/error.h>
#include <polarssl/entropy.h> #include <polarssl/entropy.h>
#include <polarssl/ctr_drbg.h> #include <polarssl/ctr_drbg.h>
#else
#include <polarssl/havege.h>
#endif /* POLARSSL_VERSION_NUMBER>0x01010000 */
#if POLARSSL_VERSION_NUMBER<0x01000000
/*
Earlier versions of polarssl had no WANT_READ or WANT_WRITE, only TRY_AGAIN
*/
#define POLARSSL_ERR_NET_WANT_READ POLARSSL_ERR_NET_TRY_AGAIN
#define POLARSSL_ERR_NET_WANT_WRITE POLARSSL_ERR_NET_TRY_AGAIN
#endif
#include "urldata.h" #include "urldata.h"
#include "sendf.h" #include "sendf.h"
@ -80,7 +68,7 @@
#define THREADING_SUPPORT #define THREADING_SUPPORT
#endif #endif
#if defined(THREADING_SUPPORT) && POLARSSL_VERSION_NUMBER>0x01010000 #if defined(THREADING_SUPPORT)
static entropy_context entropy; static entropy_context entropy;
static int entropy_init_initialized = 0; static int entropy_init_initialized = 0;
@ -111,7 +99,7 @@ static int entropy_func_mutex(void *data, unsigned char *output, size_t len)
} }
/* end of entropy_func_mutex() */ /* end of entropy_func_mutex() */
#endif /* THREADING_SUPPORT && POLARSSL_VERSION_NUMBER>0x01010000 */ #endif /* THREADING_SUPPORT
/* Define this to enable lots of debugging for PolarSSL */ /* Define this to enable lots of debugging for PolarSSL */
#undef POLARSSL_DEBUG #undef POLARSSL_DEBUG
@ -312,8 +300,8 @@ polarssl_connect_step1(struct connectdata *conn,
&connssl->crl, &connssl->crl,
conn->host.name); conn->host.name);
ssl_set_own_cert(&connssl->ssl, ssl_set_own_cert_rsa(&connssl->ssl,
&connssl->clicert, &connssl->rsa); &connssl->clicert, &connssl->rsa);
if(!Curl_inet_pton(AF_INET, conn->host.name, &addr) && if(!Curl_inet_pton(AF_INET, conn->host.name, &addr) &&
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6