openssl-engine-0.9.6 merge

1 files changed, 12 insertions, 6 deletions

diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c
index 11e564ea30..61ba856b17 100644
--- a/src/lib/libcrypto/asn1/x_x509.c
+++ b/src/lib/libcrypto/asn1/x_x509.c
@@ -61,6 +61,7 @@
 #include <openssl/evp.h>
 #include <openssl/asn1_mac.h>
 #include <openssl/x509.h>
+#include <openssl/x509v3.h>
 
 static int x509_meth_num = 0;
 static STACK_OF(CRYPTO_EX_DATA_FUNCS) *x509_meth = NULL;
@@ -102,7 +103,7 @@ X509 *d2i_X509(X509 **a, unsigned char **pp, long length)
         M_ASN1_D2I_get(ret->cert_info,d2i_X509_CINF);
         M_ASN1_D2I_get(ret->sig_alg,d2i_X509_ALGOR);
         M_ASN1_D2I_get(ret->signature,d2i_ASN1_BIT_STRING);
-        if (ret->name != NULL) Free(ret->name);
+        if (ret->name != NULL) OPENSSL_free(ret->name);
         ret->name=X509_NAME_oneline(ret->cert_info->subject,NULL,0);
 
         M_ASN1_D2I_Finish(a,X509_free,ASN1_F_D2I_X509);
@@ -114,11 +115,14 @@ X509 *X509_new(void)
         ASN1_CTX c;
 
         M_ASN1_New_Malloc(ret,X509);
-        ret->references=1;
         ret->valid=0;
+        ret->references=1;
+        ret->name = NULL;
         ret->ex_flags = 0;
-        ret->name=NULL;
-        ret->aux=NULL;
+        ret->ex_pathlen = -1;
+        ret->skid = NULL;
+        ret->akid = NULL;
+        ret->aux = NULL;
         M_ASN1_New(ret->cert_info,X509_CINF_new);
         M_ASN1_New(ret->sig_alg,X509_ALGOR_new);
         M_ASN1_New(ret->signature,M_ASN1_BIT_STRING_new);
@@ -151,9 +155,11 @@ void X509_free(X509 *a)
         X509_ALGOR_free(a->sig_alg);
         M_ASN1_BIT_STRING_free(a->signature);
         X509_CERT_AUX_free(a->aux);
+        ASN1_OCTET_STRING_free(a->skid);
+        AUTHORITY_KEYID_free(a->akid);
 
-        if (a->name != NULL) Free(a->name);
-        Free(a);
+        if (a->name != NULL) OPENSSL_free(a->name);
+        OPENSSL_free(a);
         }
 
 int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,