Clarification.

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

diff --git a/crypto/asn1/x_req.c b/crypto/asn1/x_req.c
index 949632c32549dde204aaab799fe444722acae5aa..0cd572ee73b21470f1764d7da4e8de22f3900b98 100644 (file)
--- a/crypto/asn1/x_req.c
+++ b/crypto/asn1/x_req.c
@@ -58,19 +58,10 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-#include "x509.h"
-
-/*
- * ASN1err(ASN1_F_D2I_X509_REQ,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_D2I_X509_REQ_INFO,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_REQ_NEW,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_X509_REQ_INFO_NEW,ERR_R_ASN1_LENGTH_MISMATCH);
- */
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
-int i2d_X509_REQ_INFO(a,pp)
-X509_REQ_INFO *a;
-unsigned char **pp;
+int i2d_X509_REQ_INFO(X509_REQ_INFO *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
@@ -82,16 +73,17 @@ unsigned char **pp;
         * allow some CA Software to accept the cert request.
         * It is not following the PKCS standards ...
         * PKCS#10 pg 5
-        * attributes [0] IMPLICIT Attibutes
+        * attributes [0] IMPLICIT Attributes
         * NOTE: no OPTIONAL ... so it *must* be there
         */
        if (a->req_kludge) 
                {
-               M_ASN1_I2D_len_IMP_SET_opt(a->attributes,i2d_X509_ATTRIBUTE,0);
+               M_ASN1_I2D_len_IMP_SET_opt_type(X509_ATTRIBUTE,a->attributes,i2d_X509_ATTRIBUTE,0);
                }
        else
                {
-               M_ASN1_I2D_len_IMP_SET(a->attributes,   i2d_X509_ATTRIBUTE,0);
+               M_ASN1_I2D_len_IMP_SET_type(X509_ATTRIBUTE,a->attributes,
+                                           i2d_X509_ATTRIBUTE,0);
                }
        
        M_ASN1_I2D_seq_total();
@@ -102,25 +94,25 @@ unsigned char **pp;
        /* this is a *nasty* hack reported to be required by some CA's.
         * It is not following the PKCS standards ...
         * PKCS#10 pg 5
-        * attributes [0] IMPLICIT Attibutes
+        * attributes [0] IMPLICIT Attributes
         * NOTE: no OPTIONAL ... so it *must* be there
         */
        if (a->req_kludge)
                {
-               M_ASN1_I2D_put_IMP_SET_opt(a->attributes,i2d_X509_ATTRIBUTE,0);
+               M_ASN1_I2D_put_IMP_SET_opt_type(X509_ATTRIBUTE,a->attributes,
+                                               i2d_X509_ATTRIBUTE,0);
                }
        else
                {
-               M_ASN1_I2D_put_IMP_SET(a->attributes,i2d_X509_ATTRIBUTE,0);
+               M_ASN1_I2D_put_IMP_SET_type(X509_ATTRIBUTE,a->attributes,
+                                           i2d_X509_ATTRIBUTE,0);
                }
 
        M_ASN1_I2D_finish();
        }
 
-X509_REQ_INFO *d2i_X509_REQ_INFO(a,pp,length)
-X509_REQ_INFO **a;
-unsigned char **pp;
-long length;
+X509_REQ_INFO *d2i_X509_REQ_INFO(X509_REQ_INFO **a, unsigned char **pp,
+            long length)
        {
        M_ASN1_D2I_vars(a,X509_REQ_INFO *,X509_REQ_INFO_new);
 
@@ -134,49 +126,47 @@ long length;
         * have been reported as requiring it.
         * It is not following the PKCS standards ...
         * PKCS#10 pg 5
-        * attributes [0] IMPLICIT Attibutes
+        * attributes [0] IMPLICIT Attributes
         * NOTE: no OPTIONAL ... so it *must* be there
         */
        if (asn1_Finish(&c))
                ret->req_kludge=1;
        else
                {
-               M_ASN1_D2I_get_IMP_set(ret->attributes,d2i_X509_ATTRIBUTE,
-                       X509_ATTRIBUTE_free,0);
+               M_ASN1_D2I_get_IMP_set_type(X509_ATTRIBUTE,ret->attributes,
+                                           d2i_X509_ATTRIBUTE,
+                                           X509_ATTRIBUTE_free,0);
                }
 
        M_ASN1_D2I_Finish(a,X509_REQ_INFO_free,ASN1_F_D2I_X509_REQ_INFO);
        }
 
-X509_REQ_INFO *X509_REQ_INFO_new()
+X509_REQ_INFO *X509_REQ_INFO_new(void)
        {
        X509_REQ_INFO *ret=NULL;
        ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,X509_REQ_INFO);
-       M_ASN1_New(ret->version,ASN1_INTEGER_new);
+       M_ASN1_New(ret->version,M_ASN1_INTEGER_new);
        M_ASN1_New(ret->subject,X509_NAME_new);
        M_ASN1_New(ret->pubkey,X509_PUBKEY_new);
-       M_ASN1_New(ret->attributes,sk_new_null);
+       M_ASN1_New(ret->attributes,sk_X509_ATTRIBUTE_new_null);
        ret->req_kludge=0;
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_REQ_INFO_NEW);
        }
        
-void X509_REQ_INFO_free(a)
-X509_REQ_INFO *a;
+void X509_REQ_INFO_free(X509_REQ_INFO *a)
        {
        if (a == NULL) return;
-       ASN1_INTEGER_free(a->version);
+       M_ASN1_INTEGER_free(a->version);
        X509_NAME_free(a->subject);
        X509_PUBKEY_free(a->pubkey);
-       sk_pop_free(a->attributes,X509_ATTRIBUTE_free);
-       Free((char *)a);
+       sk_X509_ATTRIBUTE_pop_free(a->attributes,X509_ATTRIBUTE_free);
+       Free(a);
        }
 
-int i2d_X509_REQ(a,pp)
-X509_REQ *a;
-unsigned char **pp;
+int i2d_X509_REQ(X509_REQ *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
        M_ASN1_I2D_len(a->req_info,     i2d_X509_REQ_INFO);
@@ -192,10 +182,7 @@ unsigned char **pp;
        M_ASN1_I2D_finish();
        }
 
-X509_REQ *d2i_X509_REQ(a,pp,length)
-X509_REQ **a;
-unsigned char **pp;
-long length;
+X509_REQ *d2i_X509_REQ(X509_REQ **a, unsigned char **pp, long length)
        {
        M_ASN1_D2I_vars(a,X509_REQ *,X509_REQ_new);
 
@@ -207,7 +194,7 @@ long length;
        M_ASN1_D2I_Finish(a,X509_REQ_free,ASN1_F_D2I_X509_REQ);
        }
 
-X509_REQ *X509_REQ_new()
+X509_REQ *X509_REQ_new(void)
        {
        X509_REQ *ret=NULL;
        ASN1_CTX c;
@@ -216,13 +203,12 @@ X509_REQ *X509_REQ_new()
        ret->references=1;
        M_ASN1_New(ret->req_info,X509_REQ_INFO_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);
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_REQ_NEW);
        }
 
-void X509_REQ_free(a)
-X509_REQ *a;
+void X509_REQ_free(X509_REQ *a)
        {
        int i;
 
@@ -243,8 +229,8 @@ X509_REQ *a;
 
        X509_REQ_INFO_free(a->req_info);
        X509_ALGOR_free(a->sig_alg);
-       ASN1_BIT_STRING_free(a->signature);
-       Free((char *)a);
+       M_ASN1_BIT_STRING_free(a->signature);
+       Free(a);
        }