Change functions to ANSI C.

[oweals/openssl.git] / crypto / asn1 / a_type.c

diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c
index 63b458358a9e03a203c6db19c61b06c67707ae89..5ccd5de00e5a97379df50314b843042a6753b672 100644 (file)
--- a/crypto/asn1/a_type.c
+++ b/crypto/asn1/a_type.c
@@ -70,9 +70,7 @@ static void ASN1_TYPE_component_free(ASN1_TYPE *a);
 static void ASN1_TYPE_component_free();
 #endif
 
-int i2d_ASN1_TYPE(a,pp)
-ASN1_TYPE *a;
-unsigned char **pp;
+int i2d_ASN1_TYPE(ASN1_TYPE *a, unsigned char **pp)
        {
        int r=0;
 
@@ -89,6 +87,10 @@ unsigned char **pp;
        case V_ASN1_NEG_INTEGER:
                r=i2d_ASN1_INTEGER(a->value.integer,pp);
                break;
+       case V_ASN1_ENUMERATED:
+       case V_ASN1_NEG_ENUMERATED:
+               r=i2d_ASN1_ENUMERATED(a->value.enumerated,pp);
+               break;
        case V_ASN1_BIT_STRING:
                r=i2d_ASN1_BIT_STRING(a->value.bit_string,pp);
                break;
@@ -113,6 +115,12 @@ unsigned char **pp;
        case V_ASN1_UNIVERSALSTRING:
                r=M_i2d_ASN1_UNIVERSALSTRING(a->value.universalstring,pp);
                break;
+       case V_ASN1_UTF8STRING:
+               r=M_i2d_ASN1_UTF8STRING(a->value.utf8string,pp);
+               break;
+       case V_ASN1_VISIBLESTRING:
+               r=M_i2d_ASN1_VISIBLESTRING(a->value.visiblestring,pp);
+               break;
        case V_ASN1_BMPSTRING:
                r=M_i2d_ASN1_BMPSTRING(a->value.bmpstring,pp);
                break;
@@ -140,10 +148,7 @@ unsigned char **pp;
        return(r);
        }
 
-ASN1_TYPE *d2i_ASN1_TYPE(a,pp,length)
-ASN1_TYPE **a;
-unsigned char **pp;
-long length;
+ASN1_TYPE *d2i_ASN1_TYPE(ASN1_TYPE **a, unsigned char **pp, long length)
        {
        ASN1_TYPE *ret=NULL;
        unsigned char *q,*p,*max;
@@ -177,6 +182,11 @@ long length;
                        d2i_ASN1_INTEGER(NULL,&p,max-p)) == NULL)
                        goto err;
                break;
+       case V_ASN1_ENUMERATED:
+               if ((ret->value.enumerated=
+                       d2i_ASN1_ENUMERATED(NULL,&p,max-p)) == NULL)
+                       goto err;
+               break;
        case V_ASN1_BIT_STRING:
                if ((ret->value.bit_string=
                        d2i_ASN1_BIT_STRING(NULL,&p,max-p)) == NULL)
@@ -187,6 +197,16 @@ long length;
                        d2i_ASN1_OCTET_STRING(NULL,&p,max-p)) == NULL)
                        goto err;
                break;
+       case V_ASN1_VISIBLESTRING:
+               if ((ret->value.visiblestring=
+                       d2i_ASN1_VISIBLESTRING(NULL,&p,max-p)) == NULL)
+                       goto err;
+               break;
+       case V_ASN1_UTF8STRING:
+               if ((ret->value.utf8string=
+                       d2i_ASN1_UTF8STRING(NULL,&p,max-p)) == NULL)
+                       goto err;
+               break;
        case V_ASN1_OBJECT:
                if ((ret->value.object=
                        d2i_ASN1_OBJECT(NULL,&p,max-p)) == NULL)
@@ -255,7 +275,7 @@ err:
        return(NULL);
        }
 
-ASN1_TYPE *ASN1_TYPE_new()
+ASN1_TYPE *ASN1_TYPE_new(void)
        {
        ASN1_TYPE *ret=NULL;
        ASN1_CTX c;
@@ -267,16 +287,14 @@ ASN1_TYPE *ASN1_TYPE_new()
        M_ASN1_New_Error(ASN1_F_ASN1_TYPE_NEW);
        }
 
-void ASN1_TYPE_free(a)
-ASN1_TYPE *a;
+void ASN1_TYPE_free(ASN1_TYPE *a)
        {
        if (a == NULL) return;
        ASN1_TYPE_component_free(a);
        Free((char *)(char *)a);
        }
 
-int ASN1_TYPE_get(a)
-ASN1_TYPE *a;
+int ASN1_TYPE_get(ASN1_TYPE *a)
        {
        if (a->value.ptr != NULL)
                return(a->type);
@@ -284,10 +302,7 @@ ASN1_TYPE *a;
                return(0);
        }
 
-void ASN1_TYPE_set(a,type,value)
-ASN1_TYPE *a;
-int type;
-char *value;
+void ASN1_TYPE_set(ASN1_TYPE *a, int type, char *value)
        {
        if (a->value.ptr != NULL)
                ASN1_TYPE_component_free(a);
@@ -295,8 +310,7 @@ char *value;
        a->value.ptr=value;
        }
 
-static void ASN1_TYPE_component_free(a)
-ASN1_TYPE *a;
+static void ASN1_TYPE_component_free(ASN1_TYPE *a)
        {
        if (a == NULL) return;
 
@@ -309,6 +323,8 @@ ASN1_TYPE *a;
                        break;
                case V_ASN1_INTEGER:
                case V_ASN1_NEG_INTEGER:
+               case V_ASN1_ENUMERATED:
+               case V_ASN1_NEG_ENUMERATED:
                case V_ASN1_BIT_STRING:
                case V_ASN1_OCTET_STRING:
                case V_ASN1_SEQUENCE:
@@ -325,6 +341,7 @@ ASN1_TYPE *a;
                case V_ASN1_GENERALSTRING:
                case V_ASN1_UNIVERSALSTRING:
                case V_ASN1_BMPSTRING:
+               case V_ASN1_UTF8STRING:
                        ASN1_STRING_free((ASN1_STRING *)a->value.ptr);
                        break;
                default: