diff options
| author | hasufell <hasufell@hasufell.de> | 2014-03-17 19:03:29 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-03-17 20:08:45 +0100 |
| commit | 4d6108315bea8d641b40668f21a72161544dc64d (patch) | |
| tree | b087cbf2dea243c4f46413770ebe53ccbd58ae80 | |
| parent | 67061e3f4ec1c2f3b4bb02bbe2d91ccdeb147c60 (diff) | |
polarssl: fix compilation
Rename x509_cert to x509_crt and add "compat-1.2.h"
include.
This would still need some more thorough conversion
in order to drop "compat-1.2.h" include.
| -rw-r--r-- | lib/urldata.h | 4 | ||||
| -rw-r--r-- | lib/vtls/polarssl.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index 9d6a9730a..8e9dff47f 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -306,8 +306,8 @@ struct ssl_connect_data { ssl_context ssl; ssl_session ssn; int server_fd; - x509_cert cacert; - x509_cert clicert; + x509_crt cacert; + x509_crt clicert; x509_crl crl; rsa_context rsa; ssl_connect_state connecting_state; diff --git a/lib/vtls/polarssl.c b/lib/vtls/polarssl.c index 3623bc37f..127a80c13 100644 --- a/lib/vtls/polarssl.c +++ b/lib/vtls/polarssl.c @@ -31,6 +31,7 @@ #ifdef USE_POLARSSL +#include <polarssl/compat-1.2.h> #include <polarssl/net.h> #include <polarssl/ssl.h> #include <polarssl/certs.h> @@ -192,7 +193,7 @@ polarssl_connect_step1(struct connectdata *conn, #endif /* POLARSSL_VERSION_NUMBER<0x01010000 */ /* Load the trusted CA */ - memset(&connssl->cacert, 0, sizeof(x509_cert)); + memset(&connssl->cacert, 0, sizeof(x509_crt)); if(data->set.str[STRING_SSL_CAFILE]) { ret = x509parse_crtfile(&connssl->cacert, @@ -211,7 +212,7 @@ polarssl_connect_step1(struct connectdata *conn, } /* Load the client certificate */ - memset(&connssl->clicert, 0, sizeof(x509_cert)); + memset(&connssl->clicert, 0, sizeof(x509_crt)); if(data->set.str[STRING_CERT]) { ret = x509parse_crtfile(&connssl->clicert, |