diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2014-03-17 20:48:06 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-03-17 20:48:06 +0100 |
| commit | 5017d5ada87916bf4113b0e9f439939ba89b78ef (patch) | |
| tree | 3761391d2b93e03595635ac13b139e8d261bdd5c /lib | |
| parent | 4d6108315bea8d641b40668f21a72161544dc64d (diff) | |
polarssl: now require 1.3.0+
Also fixed a function name change in the version requirement bump
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/vtls/polarssl.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/lib/vtls/polarssl.c b/lib/vtls/polarssl.c index 127a80c13..59d29172c 100644 --- a/lib/vtls/polarssl.c +++ b/lib/vtls/polarssl.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * 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 * you should have received as part of this distribution. The terms @@ -38,25 +38,13 @@ #include <polarssl/x509.h> #include <polarssl/version.h> -#if POLARSSL_VERSION_NUMBER >= 0x01000000 -#include <polarssl/error.h> -#endif /* POLARSSL_VERSION_NUMBER >= 0x01000000 */ +#if POLARSSL_VERSION_NUMBER < 0x01030000 +#error too old PolarSSL +#endif -#if POLARSSL_VERSION_NUMBER>0x01010000 +#include <polarssl/error.h> #include <polarssl/entropy.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 "sendf.h" @@ -80,7 +68,7 @@ #define THREADING_SUPPORT #endif -#if defined(THREADING_SUPPORT) && POLARSSL_VERSION_NUMBER>0x01010000 +#if defined(THREADING_SUPPORT) static entropy_context entropy; 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() */ -#endif /* THREADING_SUPPORT && POLARSSL_VERSION_NUMBER>0x01010000 */ +#endif /* THREADING_SUPPORT /* Define this to enable lots of debugging for PolarSSL */ #undef POLARSSL_DEBUG @@ -312,8 +300,8 @@ polarssl_connect_step1(struct connectdata *conn, &connssl->crl, conn->host.name); - ssl_set_own_cert(&connssl->ssl, - &connssl->clicert, &connssl->rsa); + ssl_set_own_cert_rsa(&connssl->ssl, + &connssl->clicert, &connssl->rsa); if(!Curl_inet_pton(AF_INET, conn->host.name, &addr) && #ifdef ENABLE_IPV6 |