moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-12 04:25:08 -05:00
Code Issues Releases Wiki Activity

polarssl: fix compilation

Browse Source 
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.
This commit is contained in:
hasufell 2014-03-17 19:03:29 +01:00 committed by Daniel Stenberg
parent 67061e3f4e
commit 4d6108315b
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/urldata.h
View File

@ -306,8 +306,8 @@ struct ssl_connect_data {
ssl_context ssl; ssl_context ssl;
ssl_session ssn; ssl_session ssn;
int server_fd; int server_fd;
x509_cert cacert; x509_crt cacert;
x509_cert clicert; x509_crt clicert;
x509_crl crl; x509_crl crl;
rsa_context rsa; rsa_context rsa;
ssl_connect_state connecting_state; ssl_connect_state connecting_state;

5
lib/vtls/polarssl.c
View File

@ -31,6 +31,7 @@
#ifdef USE_POLARSSL #ifdef USE_POLARSSL
#include <polarssl/compat-1.2.h>
#include <polarssl/net.h> #include <polarssl/net.h>
#include <polarssl/ssl.h> #include <polarssl/ssl.h>
#include <polarssl/certs.h> #include <polarssl/certs.h>
@ -192,7 +193,7 @@ polarssl_connect_step1(struct connectdata *conn,
#endif /* POLARSSL_VERSION_NUMBER<0x01010000 */ #endif /* POLARSSL_VERSION_NUMBER<0x01010000 */
/* Load the trusted CA */ /* 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]) { if(data->set.str[STRING_SSL_CAFILE]) {
ret = x509parse_crtfile(&connssl->cacert, ret = x509parse_crtfile(&connssl->cacert,
@ -211,7 +212,7 @@ polarssl_connect_step1(struct connectdata *conn,
} }
/* Load the client certificate */ /* Load the client certificate */
memset(&connssl->clicert, 0, sizeof(x509_cert)); memset(&connssl->clicert, 0, sizeof(x509_crt));
if(data->set.str[STRING_CERT]) { if(data->set.str[STRING_CERT]) {
ret = x509parse_crtfile(&connssl->clicert, ret = x509parse_crtfile(&connssl->clicert,