Various CRL enhancements tidies and workaround for broken CRLs.
[openssl.git] / crypto / asn1 / x_crl.c
index 8629a73..25657a8 100644 (file)
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-#include "x509.h"
-
-/*
- * ASN1err(ASN1_F_D2I_X509_CRL,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_D2I_X509_CRL_INFO,ERR_R_EXPECTING_AN_ASN1_SEQUENCE);
- * ASN1err(ASN1_F_D2I_X509_REVOKED,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_CRL_NEW,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_CRL_INFO_NEW,ERR_R_EXPECTING_AN_ASN1_SEQUENCE);
- * ASN1err(ASN1_F_X509_REVOKED_NEW,ERR_R_ASN1_LENGTH_MISMATCH);
- */
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
-#ifndef NOPROTO
 static int X509_REVOKED_cmp(X509_REVOKED **a,X509_REVOKED **b);
 static int X509_REVOKED_seq_cmp(X509_REVOKED **a,X509_REVOKED **b);
-#else
-static int X509_REVOKED_cmp();
-static int X509_REVOKED_seq_cmp();
-#endif
-
-int i2d_X509_REVOKED(a,pp)
-X509_REVOKED *a;
-unsigned char **pp;
+int i2d_X509_REVOKED(X509_REVOKED *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
        M_ASN1_I2D_len(a->serialNumber,i2d_ASN1_INTEGER);
        M_ASN1_I2D_len(a->revocationDate,i2d_ASN1_TIME);
-       M_ASN1_I2D_len_SEQUENCE_opt(a->extensions,i2d_X509_EXTENSION);
+       M_ASN1_I2D_len_SEQUENCE_opt_type(X509_EXTENSION,a->extensions,
+                                        i2d_X509_EXTENSION);
 
        M_ASN1_I2D_seq_total();
 
        M_ASN1_I2D_put(a->serialNumber,i2d_ASN1_INTEGER);
        M_ASN1_I2D_put(a->revocationDate,i2d_ASN1_TIME);
-       M_ASN1_I2D_put_SEQUENCE_opt(a->extensions,i2d_X509_EXTENSION);
+       M_ASN1_I2D_put_SEQUENCE_opt_type(X509_EXTENSION,a->extensions,
+                                        i2d_X509_EXTENSION);
 
        M_ASN1_I2D_finish();
        }
 
-X509_REVOKED *d2i_X509_REVOKED(a,pp,length)
-X509_REVOKED **a;
-unsigned char **pp;
-long length;
+X509_REVOKED *d2i_X509_REVOKED(X509_REVOKED **a, unsigned char **pp,
+            long length)
        {
        M_ASN1_D2I_vars(a,X509_REVOKED *,X509_REVOKED_new);
 
@@ -108,22 +91,22 @@ long length;
        M_ASN1_D2I_start_sequence();
        M_ASN1_D2I_get(ret->serialNumber,d2i_ASN1_INTEGER);
        M_ASN1_D2I_get(ret->revocationDate,d2i_ASN1_TIME);
-       M_ASN1_D2I_get_seq_opt(ret->extensions,d2i_X509_EXTENSION,
-               X509_EXTENSION_free);
+       M_ASN1_D2I_get_seq_opt_type(X509_EXTENSION,ret->extensions,
+                                   d2i_X509_EXTENSION,X509_EXTENSION_free);
        M_ASN1_D2I_Finish(a,X509_REVOKED_free,ASN1_F_D2I_X509_REVOKED);
        }
 
-int i2d_X509_CRL_INFO(a,pp)
-X509_CRL_INFO *a;
-unsigned char **pp;
+int i2d_X509_CRL_INFO(X509_CRL_INFO *a, unsigned char **pp)
        {
        int v1=0;
        long l=0;
+       int (*old_cmp)(X509_REVOKED **,X509_REVOKED **);
        M_ASN1_I2D_vars(a);
+       
+       old_cmp=sk_X509_REVOKED_set_cmp_func(a->revoked,X509_REVOKED_seq_cmp);
+       sk_X509_REVOKED_sort(a->revoked);
+       sk_X509_REVOKED_set_cmp_func(a->revoked,old_cmp);
 
-       if (sk_num(a->revoked) != 0)
-               qsort((char *)a->revoked->data,sk_num(a->revoked),
-                       sizeof(X509_REVOKED *),(int (*)(P_CC_CC))X509_REVOKED_seq_cmp);
        if ((a->version != NULL) && ((l=ASN1_INTEGER_get(a->version)) != 0))
                {
                M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
@@ -133,9 +116,11 @@ unsigned char **pp;
        M_ASN1_I2D_len(a->lastUpdate,i2d_ASN1_TIME);
        if (a->nextUpdate != NULL)
                { M_ASN1_I2D_len(a->nextUpdate,i2d_ASN1_TIME); }
-       M_ASN1_I2D_len_SEQUENCE_opt(a->revoked,i2d_X509_REVOKED);
-       M_ASN1_I2D_len_EXP_SEQUENCE_opt(a->extensions,i2d_X509_EXTENSION,0,
-               V_ASN1_SEQUENCE,v1);
+       M_ASN1_I2D_len_SEQUENCE_opt_type(X509_REVOKED,a->revoked,
+                                        i2d_X509_REVOKED);
+       M_ASN1_I2D_len_EXP_SEQUENCE_opt_type(X509_EXTENSION,a->extensions,
+                                            i2d_X509_EXTENSION,0,
+                                            V_ASN1_SEQUENCE,v1);
 
        M_ASN1_I2D_seq_total();
 
@@ -148,17 +133,17 @@ unsigned char **pp;
        M_ASN1_I2D_put(a->lastUpdate,i2d_ASN1_UTCTIME);
        if (a->nextUpdate != NULL)
                { M_ASN1_I2D_put(a->nextUpdate,i2d_ASN1_UTCTIME); }
-       M_ASN1_I2D_put_SEQUENCE_opt(a->revoked,i2d_X509_REVOKED);
-       M_ASN1_I2D_put_EXP_SEQUENCE_opt(a->extensions,i2d_X509_EXTENSION,0,
-               V_ASN1_SEQUENCE,v1);
+       M_ASN1_I2D_put_SEQUENCE_opt_type(X509_REVOKED,a->revoked,
+                                        i2d_X509_REVOKED);
+       M_ASN1_I2D_put_EXP_SEQUENCE_opt_type(X509_EXTENSION,a->extensions,
+                                            i2d_X509_EXTENSION,0,
+                                            V_ASN1_SEQUENCE,v1);
 
        M_ASN1_I2D_finish();
        }
 
-X509_CRL_INFO *d2i_X509_CRL_INFO(a,pp,length)
-X509_CRL_INFO **a;
-unsigned char **pp;
-long length;
+X509_CRL_INFO *d2i_X509_CRL_INFO(X509_CRL_INFO **a, unsigned char **pp,
+            long length)
        {
        int i,ver=0;
        M_ASN1_D2I_vars(a,X509_CRL_INFO *,X509_CRL_INFO_new);
@@ -179,11 +164,11 @@ long length;
        M_ASN1_D2I_get(ret->issuer,d2i_X509_NAME);
        M_ASN1_D2I_get(ret->lastUpdate,d2i_ASN1_TIME);
        /* Manually handle the OPTIONAL ASN1_TIME stuff */
-       if((c.slen != 0) && 
-               ( ( (M_ASN1_next & ~V_ASN1_CONSTRUCTED) ==
-                        V_ASN1_UNIVERSAL|V_ASN1_UTCTIME)
-               || ( ( (M_ASN1_next & ~V_ASN1_CONSTRUCTED) ==
-                        V_ASN1_UNIVERSAL|V_ASN1_GENERALIZEDTIME) ) ) ) {
+       if(c.slen != 0
+          && ( (M_ASN1_next & ~V_ASN1_CONSTRUCTED) ==
+                   (V_ASN1_UNIVERSAL|V_ASN1_UTCTIME)
+               || (M_ASN1_next & ~V_ASN1_CONSTRUCTED) ==
+                   (V_ASN1_UNIVERSAL|V_ASN1_GENERALIZEDTIME) ) ) {
                M_ASN1_D2I_get(ret->nextUpdate,d2i_ASN1_TIME);
        }
        if(!ret->nextUpdate) 
@@ -191,38 +176,36 @@ long length;
                                                        V_ASN1_GENERALIZEDTIME);
        if (ret->revoked != NULL)
                {
-               while (sk_num(ret->revoked))
-                       X509_REVOKED_free((X509_REVOKED *)sk_pop(ret->revoked));
+               while (sk_X509_REVOKED_num(ret->revoked))
+                       X509_REVOKED_free(sk_X509_REVOKED_pop(ret->revoked));
                }
-       M_ASN1_D2I_get_seq_opt(ret->revoked,d2i_X509_REVOKED,X509_REVOKED_free);
+       M_ASN1_D2I_get_seq_opt_type(X509_REVOKED,ret->revoked,d2i_X509_REVOKED,
+                                   X509_REVOKED_free);
 
        if (ret->revoked != NULL)
                {
-               for (i=0; i<sk_num(ret->revoked); i++)
+               for (i=0; i<sk_X509_REVOKED_num(ret->revoked); i++)
                        {
-                       ((X509_REVOKED *)sk_value(ret->revoked,i))->sequence=i;
+                       sk_X509_REVOKED_value(ret->revoked,i)->sequence=i;
                        }
                }
 
-       if (ver >= 1)
+       if (ret->extensions != NULL)
                {
-               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,
-                       X509_EXTENSION_free,0,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,0,
+                                       V_ASN1_SEQUENCE);
 
        M_ASN1_D2I_Finish(a,X509_CRL_INFO_free,ASN1_F_D2I_X509_CRL_INFO);
        }
 
-int i2d_X509_CRL(a,pp)
-X509_CRL *a;
-unsigned char **pp;
+int i2d_X509_CRL(X509_CRL *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
@@ -239,10 +222,7 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
        }
 
-X509_CRL *d2i_X509_CRL(a,pp,length)
-X509_CRL **a;
-unsigned char **pp;
-long length;
+X509_CRL *d2i_X509_CRL(X509_CRL **a, unsigned char **pp, long length)
        {
        M_ASN1_D2I_vars(a,X509_CRL *,X509_CRL_new);
 
@@ -256,7 +236,7 @@ long length;
        }
 
 
-X509_REVOKED *X509_REVOKED_new()
+X509_REVOKED *X509_REVOKED_new(void)
        {
        X509_REVOKED *ret=NULL;
        ASN1_CTX c;
@@ -269,7 +249,7 @@ X509_REVOKED *X509_REVOKED_new()
        M_ASN1_New_Error(ASN1_F_X509_REVOKED_NEW);
        }
 
-X509_CRL_INFO *X509_CRL_INFO_new()
+X509_CRL_INFO *X509_CRL_INFO_new(void)
        {
        X509_CRL_INFO *ret=NULL;
        ASN1_CTX c;
@@ -280,14 +260,14 @@ X509_CRL_INFO *X509_CRL_INFO_new()
        M_ASN1_New(ret->issuer,X509_NAME_new);
        M_ASN1_New(ret->lastUpdate,ASN1_UTCTIME_new);
        ret->nextUpdate=NULL;
-       M_ASN1_New(ret->revoked,sk_new_null);
-       M_ASN1_New(ret->extensions,sk_new_null);
-       ret->revoked->comp=(int (*)())X509_REVOKED_cmp;
+       M_ASN1_New(ret->revoked,sk_X509_REVOKED_new_null);
+       M_ASN1_New(ret->extensions,sk_X509_EXTENSION_new_null);
+       sk_X509_REVOKED_set_cmp_func(ret->revoked,X509_REVOKED_cmp);
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_CRL_INFO_NEW);
        }
 
-X509_CRL *X509_CRL_new()
+X509_CRL *X509_CRL_new(void)
        {
        X509_CRL *ret=NULL;
        ASN1_CTX c;
@@ -301,18 +281,16 @@ X509_CRL *X509_CRL_new()
        M_ASN1_New_Error(ASN1_F_X509_CRL_NEW);
        }
 
-void X509_REVOKED_free(a)
-X509_REVOKED *a;
+void X509_REVOKED_free(X509_REVOKED *a)
        {
        if (a == NULL) return;
        ASN1_INTEGER_free(a->serialNumber);
        ASN1_UTCTIME_free(a->revocationDate);
-       sk_pop_free(a->extensions,X509_EXTENSION_free);
-       Free((char *)a);
+       sk_X509_EXTENSION_pop_free(a->extensions,X509_EXTENSION_free);
+       Free(a);
        }
 
-void X509_CRL_INFO_free(a)
-X509_CRL_INFO *a;
+void X509_CRL_INFO_free(X509_CRL_INFO *a)
        {
        if (a == NULL) return;
        ASN1_INTEGER_free(a->version);
@@ -321,13 +299,12 @@ X509_CRL_INFO *a;
        ASN1_UTCTIME_free(a->lastUpdate);
        if (a->nextUpdate)
                ASN1_UTCTIME_free(a->nextUpdate);
-       sk_pop_free(a->revoked,X509_REVOKED_free);
-       sk_pop_free(a->extensions,X509_EXTENSION_free);
-       Free((char *)a);
+       sk_X509_REVOKED_pop_free(a->revoked,X509_REVOKED_free);
+       sk_X509_EXTENSION_pop_free(a->extensions,X509_EXTENSION_free);
+       Free(a);
        }
 
-void X509_CRL_free(a)
-X509_CRL *a;
+void X509_CRL_free(X509_CRL *a)
        {
        int i;
 
@@ -349,19 +326,22 @@ X509_CRL *a;
        X509_CRL_INFO_free(a->crl);
        X509_ALGOR_free(a->sig_alg);
        ASN1_BIT_STRING_free(a->signature);
-       Free((char *)a);
+       Free(a);
        }
 
-static int X509_REVOKED_cmp(a,b)
-X509_REVOKED **a,**b;
+static int X509_REVOKED_cmp(X509_REVOKED **a, X509_REVOKED **b)
        {
        return(ASN1_STRING_cmp(
                (ASN1_STRING *)(*a)->serialNumber,
                (ASN1_STRING *)(*b)->serialNumber));
        }
 
-static int X509_REVOKED_seq_cmp(a,b)
-X509_REVOKED **a,**b;
+static int X509_REVOKED_seq_cmp(X509_REVOKED **a, X509_REVOKED **b)
        {
        return((*a)->sequence-(*b)->sequence);
        }
+
+IMPLEMENT_STACK_OF(X509_REVOKED)
+IMPLEMENT_ASN1_SET_OF(X509_REVOKED)
+IMPLEMENT_STACK_OF(X509_CRL)
+IMPLEMENT_ASN1_SET_OF(X509_CRL)