[patch] curl-7.35.0-polarssl.patch

curl-7.35.0-polarssl.patch (text/plain), 1.24 KB, created by Julian Ospald on 2014-03-17 17:55:19 UTC

From: Julian Ospald <[e-mail]>
Date: Mon Mar 17 17:42:58 UTC 2014
Subject: fix compilation with polarssl

--- curl-7.35.0/lib/urldata.h
+++ curl-7.35.0/lib/urldata.h
@@ -306,8 +306,8 @@
   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;
--- curl-7.35.0/lib/vtls/polarssl.c
+++ curl-7.35.0/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 connectdat
 #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 connectdat
   }
 
   /* 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,