1 files changed, 30 insertions, 26 deletions

diff --git a/src/lib/libcrypto/asn1/x_cinf.c b/src/lib/libcrypto/asn1/x_cinf.c
index 4fc2cc9f6e..fe1b18a90f 100644
--- a/src/lib/libcrypto/asn1/x_cinf.c
+++ b/src/lib/libcrypto/asn1/x_cinf.c
@@ -58,16 +58,10 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
-/*
- * ASN1err(ASN1_F_D2I_X509_CINF,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_CINF_NEW,ASN1_R_LENGTH_MISMATCH);
- */
-
-int i2d_X509_CINF(a,pp)
-X509_CINF *a;
-unsigned char **pp;
+int i2d_X509_CINF(X509_CINF *a, unsigned char **pp)
         {
         int v1=0,v2=0;
         M_ASN1_I2D_vars(a);
@@ -81,7 +75,9 @@ unsigned char **pp;
         M_ASN1_I2D_len(a->key,                  i2d_X509_PUBKEY);
         M_ASN1_I2D_len_IMP_opt(a->issuerUID,    i2d_ASN1_BIT_STRING);
         M_ASN1_I2D_len_IMP_opt(a->subjectUID,   i2d_ASN1_BIT_STRING);
-        M_ASN1_I2D_len_EXP_set_opt(a->extensions,i2d_X509_EXTENSION,3,V_ASN1_SEQUENCE,v2);
+        M_ASN1_I2D_len_EXP_SEQUENCE_opt_type(X509_EXTENSION,a->extensions,
+                                             i2d_X509_EXTENSION,3,
+                                             V_ASN1_SEQUENCE,v2);
 
         M_ASN1_I2D_seq_total();
 
@@ -94,15 +90,14 @@ unsigned char **pp;
         M_ASN1_I2D_put(a->key,                  i2d_X509_PUBKEY);
         M_ASN1_I2D_put_IMP_opt(a->issuerUID,    i2d_ASN1_BIT_STRING,1);
         M_ASN1_I2D_put_IMP_opt(a->subjectUID,   i2d_ASN1_BIT_STRING,2);
-        M_ASN1_I2D_put_EXP_set_opt(a->extensions,i2d_X509_EXTENSION,3,V_ASN1_SEQUENCE,v2);
+        M_ASN1_I2D_put_EXP_SEQUENCE_opt_type(X509_EXTENSION,a->extensions,
+                                             i2d_X509_EXTENSION,3,
+                                             V_ASN1_SEQUENCE,v2);
 
         M_ASN1_I2D_finish();
         }
 
-X509_CINF *d2i_X509_CINF(a,pp,length)
-X509_CINF **a;
-unsigned char **pp;
-long length;
+X509_CINF *d2i_X509_CINF(X509_CINF **a, unsigned char **pp, long length)
         {
         int ver=0;
         M_ASN1_D2I_vars(a,X509_CINF *,X509_CINF_new);
@@ -140,28 +135,38 @@ long length;
                 if (ret->subjectUID != NULL)
                         {
                         ASN1_BIT_STRING_free(ret->subjectUID);
-                        ret->issuerUID=NULL;
+                        ret->subjectUID=NULL;
                         }
                 M_ASN1_D2I_get_IMP_opt(ret->issuerUID,d2i_ASN1_BIT_STRING,  1,
                         V_ASN1_BIT_STRING);
                 M_ASN1_D2I_get_IMP_opt(ret->subjectUID,d2i_ASN1_BIT_STRING, 2,
                         V_ASN1_BIT_STRING);
                 }
+/* Note: some broken certificates include extensions but don't set
+ * the version number properly. By bypassing this check they can
+ * be parsed.
+ */
+
+#ifdef VERSION_EXT_CHECK
         if (ver >= 2) /* version 3 extensions */
+#endif
                 {
                 if (ret->extensions != NULL)
-                        while (sk_num(ret->extensions))
-                                X509_EXTENSION_free((X509_EXTENSION *)
-                                        sk_pop(ret->extensions));
-                M_ASN1_D2I_get_EXP_set_opt(ret->extensions,d2i_X509_EXTENSION,3,
-                        V_ASN1_SEQUENCE);
+                        while (sk_X509_EXTENSION_num(ret->extensions))
+                                X509_EXTENSION_free(
+                                      sk_X509_EXTENSION_pop(ret->extensions));
+                M_ASN1_D2I_get_EXP_set_opt_type(X509_EXTENSION,ret->extensions,
+                                                d2i_X509_EXTENSION,
+                                                X509_EXTENSION_free,3,
+                                                V_ASN1_SEQUENCE);
                 }
         M_ASN1_D2I_Finish(a,X509_CINF_free,ASN1_F_D2I_X509_CINF);
         }
 
-X509_CINF *X509_CINF_new()
+X509_CINF *X509_CINF_new(void)
         {
         X509_CINF *ret=NULL;
+        ASN1_CTX c;
 
         M_ASN1_New_Malloc(ret,X509_CINF);
         ret->version=NULL;
@@ -178,8 +183,7 @@ X509_CINF *X509_CINF_new()
         M_ASN1_New_Error(ASN1_F_X509_CINF_NEW);
         }
 
-void X509_CINF_free(a)
-X509_CINF *a;
+void X509_CINF_free(X509_CINF *a)
         {
         if (a == NULL) return;
         ASN1_INTEGER_free(a->version);
@@ -191,7 +195,7 @@ X509_CINF *a;
         X509_PUBKEY_free(a->key);
         ASN1_BIT_STRING_free(a->issuerUID);
         ASN1_BIT_STRING_free(a->subjectUID);
-        sk_pop_free(a->extensions,X509_EXTENSION_free);
-        Free((char *)a);
+        sk_X509_EXTENSION_pop_free(a->extensions,X509_EXTENSION_free);
+        Free(a);
         }