PR: 1422

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

diff --git a/crypto/asn1/a_hdr.c b/crypto/asn1/a_hdr.c
index 1d44b9d5a1810a33b35f354b627880e9d13c45a4..d1c2a7b9e3a0388a239f90064b7099912e747454 100644 (file)
--- a/crypto/asn1/a_hdr.c
+++ b/crypto/asn1/a_hdr.c
@@ -61,13 +61,6 @@
 #include <openssl/asn1_mac.h>
 #include <openssl/asn1.h>
 
-/*
- * ASN1err(ASN1_F_D2I_ASN1_HEADER,ERR_R_ASN1_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_I2D_ASN1_HEADER,ERR_R_BAD_GET_ASN1_OBJECT_CALL);
- * ASN1err(ASN1_F_I2D_ASN1_HEADER,ERR_R_BAD_GET_ASN1_OBJECT_CALL);
- * ASN1err(ASN1_F_ASN1_HEADER_NEW,ERR_R_BAD_GET_ASN1_OBJECT_CALL);
- */
-
 int i2d_ASN1_HEADER(ASN1_HEADER *a, unsigned char **pp)
        {
        M_ASN1_I2D_vars(a);
@@ -83,17 +76,17 @@ int i2d_ASN1_HEADER(ASN1_HEADER *a, unsigned char **pp)
        M_ASN1_I2D_finish();
        }
 
-ASN1_HEADER *d2i_ASN1_HEADER(ASN1_HEADER **a, unsigned char **pp,
+ASN1_HEADER *d2i_ASN1_HEADER(ASN1_HEADER **a, const unsigned char **pp,
             long length)
        {
        M_ASN1_D2I_vars(a,ASN1_HEADER *,ASN1_HEADER_new);
 
        M_ASN1_D2I_Init();
         M_ASN1_D2I_start_sequence();
-        M_ASN1_D2I_get(ret->header,d2i_ASN1_OCTET_STRING);
+        M_ASN1_D2I_get_x(ASN1_OCTET_STRING,ret->header,d2i_ASN1_OCTET_STRING);
        if (ret->meth != NULL)
                {
-               M_ASN1_D2I_get(ret->data,ret->meth->d2i);
+               M_ASN1_D2I_get_x(void,ret->data,ret->meth->d2i);
                }
        else
                {
@@ -109,7 +102,7 @@ ASN1_HEADER *ASN1_HEADER_new(void)
        ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,ASN1_HEADER);
-       M_ASN1_New(ret->header,ASN1_OCTET_STRING_new);
+       M_ASN1_New(ret->header,M_ASN1_OCTET_STRING_new);
        ret->meth=NULL;
        ret->data=NULL;
        return(ret);
@@ -119,8 +112,8 @@ ASN1_HEADER *ASN1_HEADER_new(void)
 void ASN1_HEADER_free(ASN1_HEADER *a)
        {
        if (a == NULL) return;
-       ASN1_OCTET_STRING_free(a->header);
+       M_ASN1_OCTET_STRING_free(a->header);
        if (a->meth != NULL)
                a->meth->destroy(a->data);
-       Free((char *)a);
+       OPENSSL_free(a);
        }