Merge from the ASN1 branch of new ASN1 code
[openssl.git] / crypto / asn1 / x_crl.c
index 1f302d0..bf13df8 100644 (file)
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include <openssl/asn1_mac.h>
+#include <openssl/asn1t.h>
 #include <openssl/x509.h>
 
 static int X509_REVOKED_cmp(const X509_REVOKED * const *a,
                                const X509_REVOKED * const *b);
 static int X509_REVOKED_seq_cmp(const X509_REVOKED * const *a,
                                const X509_REVOKED * const *b);
-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_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_type(X509_EXTENSION,a->extensions,
-                                        i2d_X509_EXTENSION);
-
-       M_ASN1_I2D_finish();
-       }
-
-X509_REVOKED *d2i_X509_REVOKED(X509_REVOKED **a, unsigned char **pp,
-            long length)
-       {
-       M_ASN1_D2I_vars(a,X509_REVOKED *,X509_REVOKED_new);
-
-       M_ASN1_D2I_Init();
-       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_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(X509_CRL_INFO *a, unsigned char **pp)
-       {
-       int v1=0;
-       long l=0;
+ASN1_SEQUENCE(X509_REVOKED) = {
+       ASN1_SIMPLE(X509_REVOKED,serialNumber, ASN1_INTEGER),
+       ASN1_SIMPLE(X509_REVOKED,revocationDate, ASN1_TIME),
+       ASN1_SEQUENCE_OF_OPT(X509_REVOKED,extensions, X509_EXTENSION)
+} ASN1_SEQUENCE_END(X509_REVOKED);
+
+/* The X509_CRL_INFO structure needs a bit of customisation. This is actually
+ * mirroring the old behaviour: its purpose is to allow the use of
+ * sk_X509_REVOKED_find to lookup revoked certificates. Unfortunately
+ * this will zap the original order and the signature so we keep a copy
+ * of the original positions and reorder appropriately before encoding.
+ *
+ * Might want to see if there's a better way of doing this later...
+ */
+static int crl_inf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)
+{
+       X509_CRL_INFO *a = (X509_CRL_INFO *)*pval;
+       int i;
        int (*old_cmp)(const X509_REVOKED * const *,
                        const X509_REVOKED * const *);
-       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 ((a->version != NULL) && ((l=ASN1_INTEGER_get(a->version)) != 0))
-               {
-               M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
-               }
-       M_ASN1_I2D_len(a->sig_alg,i2d_X509_ALGOR);
-       M_ASN1_I2D_len(a->issuer,i2d_X509_NAME);
-       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_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();
-
-       if ((a->version != NULL) && (l != 0))
-               {
-               M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
-               }
-       M_ASN1_I2D_put(a->sig_alg,i2d_X509_ALGOR);
-       M_ASN1_I2D_put(a->issuer,i2d_X509_NAME);
-       M_ASN1_I2D_put(a->lastUpdate,i2d_ASN1_TIME);
-       if (a->nextUpdate != NULL)
-               { M_ASN1_I2D_put(a->nextUpdate,i2d_ASN1_TIME); }
-       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(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);
-
-
-       M_ASN1_D2I_Init();
-       M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get_opt(ret->version,d2i_ASN1_INTEGER,V_ASN1_INTEGER);
-       if (ret->version != NULL)
-               ver=ret->version->data[0];
-       
-       if ((ver == 0) && (ret->version != NULL))
-               {
-               M_ASN1_INTEGER_free(ret->version);
-               ret->version=NULL;
-               }
-       M_ASN1_D2I_get(ret->sig_alg,d2i_X509_ALGOR);
-       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 */
-       /* First try UTCTime */
-       M_ASN1_D2I_get_opt(ret->nextUpdate,d2i_ASN1_UTCTIME, V_ASN1_UTCTIME);
-       /* If that doesn't work try GeneralizedTime */
-       if(!ret->nextUpdate) 
-               M_ASN1_D2I_get_opt(ret->nextUpdate,d2i_ASN1_GENERALIZEDTIME,
-                                                       V_ASN1_GENERALIZEDTIME);
-       if (ret->revoked != NULL)
-               {
-               while (sk_X509_REVOKED_num(ret->revoked))
-                       X509_REVOKED_free(sk_X509_REVOKED_pop(ret->revoked));
-               }
-       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_X509_REVOKED_num(ret->revoked); i++)
-                       {
-                       sk_X509_REVOKED_value(ret->revoked,i)->sequence=i;
-                       }
-               }
-
-       if (ret->extensions != NULL)
-               {
-               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(X509_CRL *a, unsigned char **pp)
-       {
-       M_ASN1_I2D_vars(a);
-
-       M_ASN1_I2D_len(a->crl,i2d_X509_CRL_INFO);
-       M_ASN1_I2D_len(a->sig_alg,i2d_X509_ALGOR);
-       M_ASN1_I2D_len(a->signature,i2d_ASN1_BIT_STRING);
-
-       M_ASN1_I2D_seq_total();
-
-       M_ASN1_I2D_put(a->crl,i2d_X509_CRL_INFO);
-       M_ASN1_I2D_put(a->sig_alg,i2d_X509_ALGOR);
-       M_ASN1_I2D_put(a->signature,i2d_ASN1_BIT_STRING);
-
-       M_ASN1_I2D_finish();
-       }
-
-X509_CRL *d2i_X509_CRL(X509_CRL **a, unsigned char **pp, long length)
-       {
-       M_ASN1_D2I_vars(a,X509_CRL *,X509_CRL_new);
-
-       M_ASN1_D2I_Init();
-       M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get(ret->crl,d2i_X509_CRL_INFO);
-       M_ASN1_D2I_get(ret->sig_alg,d2i_X509_ALGOR);
-       M_ASN1_D2I_get(ret->signature,d2i_ASN1_BIT_STRING);
-
-       M_ASN1_D2I_Finish(a,X509_CRL_free,ASN1_F_D2I_X509_CRL);
-       }
-
-
-X509_REVOKED *X509_REVOKED_new(void)
-       {
-       X509_REVOKED *ret=NULL;
-       ASN1_CTX c;
-
-       M_ASN1_New_Malloc(ret,X509_REVOKED);
-       M_ASN1_New(ret->serialNumber,M_ASN1_INTEGER_new);
-       M_ASN1_New(ret->revocationDate,M_ASN1_UTCTIME_new);
-       ret->extensions=NULL;
-       return(ret);
-       M_ASN1_New_Error(ASN1_F_X509_REVOKED_NEW);
-       }
-
-X509_CRL_INFO *X509_CRL_INFO_new(void)
-       {
-       X509_CRL_INFO *ret=NULL;
-       ASN1_CTX c;
-
-       M_ASN1_New_Malloc(ret,X509_CRL_INFO);
-       ret->version=NULL;
-       M_ASN1_New(ret->sig_alg,X509_ALGOR_new);
-       M_ASN1_New(ret->issuer,X509_NAME_new);
-       M_ASN1_New(ret->lastUpdate,M_ASN1_UTCTIME_new);
-       ret->nextUpdate=NULL;
-       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(void)
-       {
-       X509_CRL *ret=NULL;
-       ASN1_CTX c;
-
-       M_ASN1_New_Malloc(ret,X509_CRL);
-       ret->references=1;
-       M_ASN1_New(ret->crl,X509_CRL_INFO_new);
-       M_ASN1_New(ret->sig_alg,X509_ALGOR_new);
-       M_ASN1_New(ret->signature,M_ASN1_BIT_STRING_new);
-       return(ret);
-       M_ASN1_New_Error(ASN1_F_X509_CRL_NEW);
-       }
-
-void X509_REVOKED_free(X509_REVOKED *a)
-       {
-       if (a == NULL) return;
-       M_ASN1_INTEGER_free(a->serialNumber);
-       M_ASN1_UTCTIME_free(a->revocationDate);
-       sk_X509_EXTENSION_pop_free(a->extensions,X509_EXTENSION_free);
-       OPENSSL_free(a);
-       }
-
-void X509_CRL_INFO_free(X509_CRL_INFO *a)
-       {
-       if (a == NULL) return;
-       M_ASN1_INTEGER_free(a->version);
-       X509_ALGOR_free(a->sig_alg);
-       X509_NAME_free(a->issuer);
-       M_ASN1_UTCTIME_free(a->lastUpdate);
-       if (a->nextUpdate)
-               M_ASN1_UTCTIME_free(a->nextUpdate);
-       sk_X509_REVOKED_pop_free(a->revoked,X509_REVOKED_free);
-       sk_X509_EXTENSION_pop_free(a->extensions,X509_EXTENSION_free);
-       OPENSSL_free(a);
-       }
-
-void X509_CRL_free(X509_CRL *a)
-       {
-       int i;
-
-       if (a == NULL) return;
-
-       i=CRYPTO_add(&a->references,-1,CRYPTO_LOCK_X509_CRL);
-#ifdef REF_PRINT
-       REF_PRINT("X509_CRL",a);
-#endif
-       if (i > 0) return;
-#ifdef REF_CHECK
-       if (i < 0)
-               {
-               fprintf(stderr,"X509_CRL_free, bad reference count\n");
-               abort();
-               }
-#endif
-
-       X509_CRL_INFO_free(a->crl);
-       X509_ALGOR_free(a->sig_alg);
-       M_ASN1_BIT_STRING_free(a->signature);
-       OPENSSL_free(a);
+       if(!a || !a->revoked) return 1;
+       switch(operation) {
+
+               /* Save original order */
+               case ASN1_OP_D2I_POST:
+               for (i=0; i<sk_X509_REVOKED_num(a->revoked); i++)
+                       sk_X509_REVOKED_value(a->revoked,i)->sequence=i;
+               sk_X509_REVOKED_set_cmp_func(a->revoked,X509_REVOKED_cmp);
+               break;
+
+               /* Restore original order */
+               case ASN1_OP_I2D_PRE:
+               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);
+               break;
        }
+       return 1;
+}
+
+
+ASN1_SEQUENCE_cb(X509_CRL_INFO, crl_inf_cb) = {
+       ASN1_OPT(X509_CRL_INFO, version, ASN1_INTEGER),
+       ASN1_SIMPLE(X509_CRL_INFO, sig_alg, X509_ALGOR),
+       ASN1_SIMPLE(X509_CRL_INFO, issuer, X509_NAME),
+       ASN1_SIMPLE(X509_CRL_INFO, lastUpdate, ASN1_TIME),
+       ASN1_OPT(X509_CRL_INFO, nextUpdate, ASN1_TIME),
+       ASN1_SEQUENCE_OF_OPT(X509_CRL_INFO, revoked, X509_REVOKED),
+       ASN1_EXP_SEQUENCE_OF_OPT(X509_CRL_INFO, extensions, X509_EXTENSION, 0)
+} ASN1_SEQUENCE_END_cb(X509_CRL_INFO, X509_CRL_INFO);
+
+ASN1_SEQUENCE_ref(X509_CRL, 0, CRYPTO_LOCK_X509_CRL) = {
+       ASN1_SIMPLE(X509_CRL, crl, X509_CRL_INFO),
+       ASN1_SIMPLE(X509_CRL, sig_alg, X509_ALGOR),
+       ASN1_SIMPLE(X509_CRL, signature, ASN1_BIT_STRING)
+} ASN1_SEQUENCE_END_ref(X509_CRL, X509_CRL);
+
+IMPLEMENT_ASN1_FUNCTIONS(X509_REVOKED)
+IMPLEMENT_ASN1_FUNCTIONS(X509_CRL_INFO)
+IMPLEMENT_ASN1_FUNCTIONS(X509_CRL)
 
 static int X509_REVOKED_cmp(const X509_REVOKED * const *a,
                        const X509_REVOKED * const *b)
@@ -342,6 +142,19 @@ static int X509_REVOKED_seq_cmp(const X509_REVOKED * const *a,
        return((*a)->sequence-(*b)->sequence);
        }
 
+int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev)
+{
+       X509_CRL_INFO *inf;
+       inf = crl->crl;
+       if(!inf->revoked)
+               inf->revoked = sk_X509_REVOKED_new(X509_REVOKED_cmp);
+       if(!inf->revoked || !sk_X509_REVOKED_push(inf->revoked, rev)) {
+               ASN1err(ASN1_F_X509_CRL_ADD0_REVOKED, ERR_R_MALLOC_FAILURE);
+               return 0;
+       }
+       return 1;
+}
+
 IMPLEMENT_STACK_OF(X509_REVOKED)
 IMPLEMENT_ASN1_SET_OF(X509_REVOKED)
 IMPLEMENT_STACK_OF(X509_CRL)