New macro BIO_set_shutdown_wr().

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

diff --git a/crypto/asn1/x_req.c b/crypto/asn1/x_req.c
index 0f14e307e18b7e912f8b47bcb48c5b69e4a905f2..6dddd4f653edbac51190579628b8b658191b1104 100644 (file)
--- a/crypto/asn1/x_req.c
+++ b/crypto/asn1/x_req.c
@@ -65,6 +65,14 @@ int i2d_X509_REQ_INFO(X509_REQ_INFO *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
 
+       if(a->asn1) {
+               if(pp) {
+                       memcpy(*pp, a->asn1, a->length);
+                       *pp += a->length;
+               }
+               return a->length;
+       }
+
        M_ASN1_I2D_len(a->version,              i2d_ASN1_INTEGER);
        M_ASN1_I2D_len(a->subject,              i2d_X509_NAME);
        M_ASN1_I2D_len(a->pubkey,               i2d_X509_PUBKEY);
@@ -73,16 +81,17 @@ int i2d_X509_REQ_INFO(X509_REQ_INFO *a, 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();
@@ -93,16 +102,18 @@ int i2d_X509_REQ_INFO(X509_REQ_INFO *a, 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();
@@ -123,15 +134,16 @@ X509_REQ_INFO *d2i_X509_REQ_INFO(X509_REQ_INFO **a, unsigned char **pp,
         * 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);
@@ -143,11 +155,12 @@ X509_REQ_INFO *X509_REQ_INFO_new(void)
        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;
+       ret->asn1 = NULL;
        return(ret);
        M_ASN1_New_Error(ASN1_F_X509_REQ_INFO_NEW);
        }
@@ -155,11 +168,12 @@ X509_REQ_INFO *X509_REQ_INFO_new(void)
 void X509_REQ_INFO_free(X509_REQ_INFO *a)
        {
        if (a == NULL) return;
-       ASN1_INTEGER_free(a->version);
+       if(a->asn1) OPENSSL_free(a->asn1);
+       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);
+       OPENSSL_free(a);
        }
 
 int i2d_X509_REQ(X509_REQ *a, unsigned char **pp)
@@ -185,6 +199,17 @@ X509_REQ *d2i_X509_REQ(X509_REQ **a, unsigned char **pp, long length)
        M_ASN1_D2I_Init();
        M_ASN1_D2I_start_sequence();
        M_ASN1_D2I_get(ret->req_info,d2i_X509_REQ_INFO);
+
+       /* Keep a copy of the original encoding for signature checking */
+       ret->req_info->length = c.p - c.q;
+       if(!(ret->req_info->asn1 = OPENSSL_malloc(ret->req_info->length))) {
+               c.line=__LINE__;
+               c.error = ERR_R_MALLOC_FAILURE;
+               goto err;
+       }
+
+       memcpy(ret->req_info->asn1, c.q, ret->req_info->length);
+
        M_ASN1_D2I_get(ret->sig_alg,d2i_X509_ALGOR);
        M_ASN1_D2I_get(ret->signature,d2i_ASN1_BIT_STRING);
        M_ASN1_D2I_Finish(a,X509_REQ_free,ASN1_F_D2I_X509_REQ);
@@ -199,7 +224,7 @@ X509_REQ *X509_REQ_new(void)
        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);
        }
@@ -225,8 +250,8 @@ void X509_REQ_free(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);
+       OPENSSL_free(a);
        }