Change functions to ANSI C.

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

diff --git a/crypto/asn1/x_name.c b/crypto/asn1/x_name.c
index c03f9169cb212a20f2179dea6214ce56759f26ed..939b1699d6b34069fa968450cc8e4d6a0b1eced5 100644 (file)
--- a/crypto/asn1/x_name.c
+++ b/crypto/asn1/x_name.c
@@ -1,5 +1,5 @@
 /* crypto/asn1/x_name.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
@@ -62,9 +62,9 @@
 #include "asn1_mac.h"
 
 /*
- * ASN1err(ASN1_F_D2I_X509_NAME,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_X509_NAME,ERR_R_ASN1_LENGTH_MISMATCH);
  * ASN1err(ASN1_F_X509_NAME_NEW,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
- * ASN1err(ASN1_F_D2I_X509_NAME_ENTRY,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_X509_NAME_ENTRY,ERR_R_ASN1_LENGTH_MISMATCH);
  * ASN1err(ASN1_F_X509_NAME_ENTRY_NEW,ASN1_R_UNKNOWN_ATTRIBUTE_TYPE);
  */
 
@@ -74,9 +74,7 @@ static int i2d_X509_NAME_entries(X509_NAME *a);
 static int i2d_X509_NAME_entries();
 #endif
 
-int i2d_X509_NAME_ENTRY(a,pp)
-X509_NAME_ENTRY *a;
-unsigned char **pp;
+int i2d_X509_NAME_ENTRY(X509_NAME_ENTRY *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
@@ -91,10 +89,8 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
        }
 
-X509_NAME_ENTRY *d2i_X509_NAME_ENTRY(a,pp,length)
-X509_NAME_ENTRY **a;
-unsigned char **pp;
-long length;
+X509_NAME_ENTRY *d2i_X509_NAME_ENTRY(X509_NAME_ENTRY **a, unsigned char **pp,
+            long length)
        {
        M_ASN1_D2I_vars(a,X509_NAME_ENTRY *,X509_NAME_ENTRY_new);
 
@@ -106,9 +102,7 @@ long length;
        M_ASN1_D2I_Finish(a,X509_NAME_ENTRY_free,ASN1_F_D2I_X509_NAME_ENTRY);
        }
 
-int i2d_X509_NAME(a,pp)
-X509_NAME *a;
-unsigned char **pp;
+int i2d_X509_NAME(X509_NAME *a, unsigned char **pp)
        {
        int ret;
 
@@ -128,8 +122,7 @@ unsigned char **pp;
        return(ret);
        }
 
-static int i2d_X509_NAME_entries(a)
-X509_NAME *a;
+static int i2d_X509_NAME_entries(X509_NAME *a)
        {
        X509_NAME_ENTRY *ne,*fe=NULL;
        STACK *sk;
@@ -190,10 +183,7 @@ err:
        return(-1);
        }
 
-X509_NAME *d2i_X509_NAME(a,pp,length)
-X509_NAME **a;
-unsigned char **pp;
-long length;
+X509_NAME *d2i_X509_NAME(X509_NAME **a, unsigned char **pp, long length)
        {
        int set=0,i;
        int idx=0;
@@ -213,7 +203,8 @@ long length;
        for (;;)
                {
                if (M_ASN1_D2I_end_sequence()) break;
-               M_ASN1_D2I_get_set(ret->entries,d2i_X509_NAME_ENTRY);
+               M_ASN1_D2I_get_set(ret->entries,d2i_X509_NAME_ENTRY,
+                       X509_NAME_ENTRY_free);
                for (; idx < sk_num(ret->entries); idx++)
                        {
                        ((X509_NAME_ENTRY *)sk_value(ret->entries,idx))->set=
@@ -231,21 +222,24 @@ long length;
        M_ASN1_D2I_Finish(a,X509_NAME_free,ASN1_F_D2I_X509_NAME);
        }
 
-X509_NAME *X509_NAME_new()
+X509_NAME *X509_NAME_new(void)
        {
        X509_NAME *ret=NULL;
+       ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,X509_NAME);
-       if ((ret->entries=sk_new(NULL)) == NULL) goto err2;
+       if ((ret->entries=sk_new(NULL)) == NULL)
+               { c.line=__LINE__; goto err2; }
        M_ASN1_New(ret->bytes,BUF_MEM_new);
        ret->modified=1;
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_NAME_NEW);
        }
 
-X509_NAME_ENTRY *X509_NAME_ENTRY_new()
+X509_NAME_ENTRY *X509_NAME_ENTRY_new(void)
        {
        X509_NAME_ENTRY *ret=NULL;
+       ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,X509_NAME_ENTRY);
 /*     M_ASN1_New(ret->object,ASN1_OBJECT_new);*/
@@ -256,16 +250,17 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_new()
        M_ASN1_New_Error(ASN1_F_X509_NAME_ENTRY_NEW);
        }
 
-void X509_NAME_free(a)
-X509_NAME *a;
+void X509_NAME_free(X509_NAME *a)
        {
+       if(a == NULL)
+           return;
+
        BUF_MEM_free(a->bytes);
        sk_pop_free(a->entries,X509_NAME_ENTRY_free);
        Free((char *)a);
        }
 
-void X509_NAME_ENTRY_free(a)
-X509_NAME_ENTRY *a;
+void X509_NAME_ENTRY_free(X509_NAME_ENTRY *a)
        {
        if (a == NULL) return;
        ASN1_OBJECT_free(a->object);
@@ -273,9 +268,7 @@ X509_NAME_ENTRY *a;
        Free((char *)a);
        }
 
-int X509_NAME_set(xn,name)
-X509_NAME **xn;
-X509_NAME *name;
+int X509_NAME_set(X509_NAME **xn, X509_NAME *name)
        {
        X509_NAME *in;