Initial support for certificate purpose checking: this will

[openssl.git] / crypto / asn1 / x_x509.c

diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index 8e7d214d2113d220c7eaf8d72598d29f39f32b18..5326debe0046a06c15bf72e8695d9b484940c991 100644 (file)
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -58,13 +58,12 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "asn1_mac.h"
+#include <openssl/evp.h>
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
-/*
- * ASN1err(ASN1_F_D2I_X509,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_NEW,ERR_R_BAD_GET_ASN1_OBJECT_CALL);
- */
+static int x509_meth_num = 0;
+static STACK *x509_meth = NULL;
 
 static ASN1_METHOD meth={
        (int (*)())  i2d_X509,
@@ -72,14 +71,12 @@ static ASN1_METHOD meth={
        (char *(*)())X509_new,
        (void (*)()) X509_free};
 
-ASN1_METHOD *X509_asn1_meth()
+ASN1_METHOD *X509_asn1_meth(void)
        {
        return(&meth);
        }
 
-int i2d_X509(a,pp)
-X509 *a;
-unsigned char **pp;
+int i2d_X509(X509 *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
@@ -96,10 +93,7 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
        }
 
-X509 *d2i_X509(a,pp,length)
-X509 **a;
-unsigned char **pp;
-long length;
+X509 *d2i_X509(X509 **a, unsigned char **pp, long length)
        {
        M_ASN1_D2I_vars(a,X509 *,X509_new);
 
@@ -114,7 +108,7 @@ long length;
        M_ASN1_D2I_Finish(a,X509_free,ASN1_F_D2I_X509);
        }
 
-X509 *X509_new()
+X509 *X509_new(void)
        {
        X509 *ret=NULL;
        ASN1_CTX c;
@@ -122,16 +116,17 @@ X509 *X509_new()
        M_ASN1_New_Malloc(ret,X509);
        ret->references=1;
        ret->valid=0;
+       ret->ex_flags = 0;
        ret->name=NULL;
        M_ASN1_New(ret->cert_info,X509_CINF_new);
        M_ASN1_New(ret->sig_alg,X509_ALGOR_new);
        M_ASN1_New(ret->signature,ASN1_BIT_STRING_new);
+       CRYPTO_new_ex_data(x509_meth, (char *)ret, &ret->ex_data);
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_NEW);
        }
 
-void X509_free(a)
-X509 *a;
+void X509_free(X509 *a)
        {
        int i;
 
@@ -150,7 +145,7 @@ X509 *a;
                }
 #endif
 
-       /* CRYPTO_free_ex_data(bio_meth,(char *)a,&a->ex_data); */
+       CRYPTO_free_ex_data(x509_meth,(char *)a,&a->ex_data);
        X509_CINF_free(a->cert_info);
        X509_ALGOR_free(a->sig_alg);
        ASN1_BIT_STRING_free(a->signature);
@@ -159,3 +154,21 @@ X509 *a;
        Free((char *)a);
        }
 
+int X509_get_ex_new_index(long argl, char *argp, int (*new_func)(),
+            int (*dup_func)(), void (*free_func)())
+        {
+       x509_meth_num++;
+       return(CRYPTO_get_ex_new_index(x509_meth_num-1,
+               &x509_meth,argl,argp,new_func,dup_func,free_func));
+        }
+
+int X509_set_ex_data(X509 *r, int idx, char *arg)
+       {
+       return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
+       }
+
+char *X509_get_ex_data(X509 *r, int idx)
+       {
+       return(CRYPTO_get_ex_data(&r->ex_data,idx));
+       }
+