Various fixes...

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

diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c
index d80a5cbc013ae9b374209dc9c7d6c4d9f8a7f095..36f0e4743eefd098e72f18b79bc251b6de834960 100644 (file)
--- a/crypto/asn1/x_x509.c
+++ b/crypto/asn1/x_x509.c
@@ -1,5 +1,5 @@
 /* crypto/asn1/x_x509.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -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,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_NEW,ASN1_R_BAD_GET_OBJECT);
- */
+static int x509_meth_num = 0;
+static STACK_OF(CRYPTO_EX_DATA_FUNCS) *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);
 
@@ -108,35 +102,42 @@ 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);
-ret->name=X509_NAME_oneline(ret->cert_info->subject,NULL,0);
+       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);
        }
 
-X509 *X509_new()
+X509 *X509_new(void)
        {
        X509 *ret=NULL;
+       ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,X509);
        ret->references=1;
        ret->valid=0;
+       ret->ex_flags = 0;
+       ret->ex_pathlen = -1;
        ret->name=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,ASN1_BIT_STRING_new);
+       M_ASN1_New(ret->signature,M_ASN1_BIT_STRING_new);
+       CRYPTO_new_ex_data(x509_meth, 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;
 
        if (a == NULL) return;
 
        i=CRYPTO_add(&a->references,-1,CRYPTO_LOCK_X509);
+#ifdef REF_PRINT
+       REF_PRINT("X509",a);
+#endif
        if (i > 0) return;
 #ifdef REF_CHECK
        if (i < 0)
@@ -146,10 +147,65 @@ X509 *a;
                }
 #endif
 
+       CRYPTO_free_ex_data(x509_meth,a,&a->ex_data);
        X509_CINF_free(a->cert_info);
        X509_ALGOR_free(a->sig_alg);
-       ASN1_BIT_STRING_free(a->signature);
-       if (a->name != NULL) Free(a->name);
-       Free((char *)a);
+       M_ASN1_BIT_STRING_free(a->signature);
+       X509_CERT_AUX_free(a->aux);
+
+       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,
+            CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *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, void *arg)
+       {
+       return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
        }
 
+void *X509_get_ex_data(X509 *r, int idx)
+       {
+       return(CRYPTO_get_ex_data(&r->ex_data,idx));
+       }
+
+/* X509_AUX ASN1 routines. X509_AUX is the name given to
+ * a certificate with extra info tagged on the end. Since these
+ * functions set how a certificate is trusted they should only
+ * be used when the certificate comes from a reliable source
+ * such as local storage.
+ *
+ */
+
+X509 *d2i_X509_AUX(X509 **a, unsigned char **pp, long length)
+{
+       unsigned char *q;
+       X509 *ret;
+       /* Save start position */
+       q = *pp;
+       ret = d2i_X509(a, pp, length);
+       /* If certificate unreadable then forget it */
+       if(!ret) return NULL;
+       /* update length */
+       length -= *pp - q;
+       if(!length) return ret;
+       if(!d2i_X509_CERT_AUX(&ret->aux, pp, length)) goto err;
+       return ret;
+       err:
+       X509_free(ret);
+       return NULL;
+}
+
+int i2d_X509_AUX(X509 *a, unsigned char **pp)
+{
+       int length;
+       length = i2d_X509(a, pp);
+       if(a) length += i2d_X509_CERT_AUX(a->aux, pp);
+       return length;
+}