|
Line
Link Here
|
| 0 |
-- curl-7.35.0/lib/urldata.h |
0 |
++ curl-7.35.0/lib/urldata.h |
|
Lines 306-313
Link Here
|
| 306 |
ssl_context ssl; |
306 |
ssl_context ssl; |
| 307 |
ssl_session ssn; |
307 |
ssl_session ssn; |
| 308 |
int server_fd; |
308 |
int server_fd; |
| 309 |
x509_cert cacert; |
309 |
x509_crt cacert; |
| 310 |
x509_cert clicert; |
310 |
x509_crt clicert; |
| 311 |
x509_crl crl; |
311 |
x509_crl crl; |
| 312 |
rsa_context rsa; |
312 |
rsa_context rsa; |
| 313 |
ssl_connect_state connecting_state; |
313 |
ssl_connect_state connecting_state; |
| 314 |
-- curl-7.35.0/lib/vtls/polarssl.c |
314 |
++ curl-7.35.0/lib/vtls/polarssl.c |
|
Lines 31-36
Link Here
|
| 31 |
|
31 |
|
| 32 |
#ifdef USE_POLARSSL |
32 |
#ifdef USE_POLARSSL |
| 33 |
|
33 |
|
|
|
34 |
#include <polarssl/compat-1.2.h> |
| 34 |
#include <polarssl/net.h> |
35 |
#include <polarssl/net.h> |
| 35 |
#include <polarssl/ssl.h> |
36 |
#include <polarssl/ssl.h> |
| 36 |
#include <polarssl/certs.h> |
37 |
#include <polarssl/certs.h> |
|
Lines 192-198
polarssl_connect_step1(struct connectdat
Link Here
|
| 192 |
#endif /* POLARSSL_VERSION_NUMBER<0x01010000 */ |
193 |
#endif /* POLARSSL_VERSION_NUMBER<0x01010000 */ |
| 193 |
|
194 |
|
| 194 |
/* Load the trusted CA */ |
195 |
/* Load the trusted CA */ |
| 195 |
memset(&connssl->cacert, 0, sizeof(x509_cert)); |
196 |
memset(&connssl->cacert, 0, sizeof(x509_crt)); |
| 196 |
|
197 |
|
| 197 |
if(data->set.str[STRING_SSL_CAFILE]) { |
198 |
if(data->set.str[STRING_SSL_CAFILE]) { |
| 198 |
ret = x509parse_crtfile(&connssl->cacert, |
199 |
ret = x509parse_crtfile(&connssl->cacert, |
|
Lines 211-217
polarssl_connect_step1(struct connectdat
Link Here
|
| 211 |
} |
212 |
} |
| 212 |
|
213 |
|
| 213 |
/* Load the client certificate */ |
214 |
/* Load the client certificate */ |
| 214 |
memset(&connssl->clicert, 0, sizeof(x509_cert)); |
215 |
memset(&connssl->clicert, 0, sizeof(x509_crt)); |
| 215 |
|
216 |
|
| 216 |
if(data->set.str[STRING_CERT]) { |
217 |
if(data->set.str[STRING_CERT]) { |
| 217 |
ret = x509parse_crtfile(&connssl->clicert, |
218 |
ret = x509parse_crtfile(&connssl->clicert, |
