There have been a number of complaints from a number of sources that names

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

diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 95e54ed6267d029d5f630973acce892946f211a3..11f8654c36e4c56b7250827a36f23ab4896cb458 100644 (file)
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -176,7 +176,7 @@ static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
        }
 
 /* class 0 is constructed
- * constructed == 2 for indefinitle length constructed */
+ * constructed == 2 for indefinite length constructed */
 void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
             int xclass)
        {
@@ -335,9 +335,9 @@ int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
                {
                c=str->data;
                if (c == NULL)
-                       str->data=Malloc(len+1);
+                       str->data=OPENSSL_malloc(len+1);
                else
-                       str->data=Realloc(c,len+1);
+                       str->data=OPENSSL_realloc(c,len+1);
 
                if (str->data == NULL)
                        {
@@ -349,7 +349,7 @@ int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
        if (data != NULL)
                {
                memcpy(str->data,data,len);
-               /* an alowance for strings :-) */
+               /* an allowance for strings :-) */
                str->data[len]='\0';
                }
        return(1);
@@ -365,7 +365,7 @@ ASN1_STRING *ASN1_STRING_type_new(int type)
        {
        ASN1_STRING *ret;
 
-       ret=(ASN1_STRING *)Malloc(sizeof(ASN1_STRING));
+       ret=(ASN1_STRING *)OPENSSL_malloc(sizeof(ASN1_STRING));
        if (ret == NULL)
                {
                ASN1err(ASN1_F_ASN1_STRING_TYPE_NEW,ERR_R_MALLOC_FAILURE);
@@ -381,8 +381,8 @@ ASN1_STRING *ASN1_STRING_type_new(int type)
 void ASN1_STRING_free(ASN1_STRING *a)
        {
        if (a == NULL) return;
-       if (a->data != NULL) Free((char *)a->data);
-       Free((char *)a);
+       if (a->data != NULL) OPENSSL_free(a->data);
+       OPENSSL_free(a);
        }
 
 int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)
@@ -411,3 +411,14 @@ void asn1_add_error(unsigned char *address, int offset)
        ERR_add_error_data(4,"address=",buf1," offset=",buf2);
        }
 
+int ASN1_STRING_length(ASN1_STRING *x)
+{ return M_ASN1_STRING_length(x); }
+
+void ASN1_STRING_length_set(ASN1_STRING *x, int len)
+{ M_ASN1_STRING_length_set(x, len); return; }
+
+int ASN1_STRING_type(ASN1_STRING *x)
+{ return M_ASN1_STRING_type(x); }
+
+unsigned char * ASN1_STRING_data(ASN1_STRING *x)
+{ return M_ASN1_STRING_data(x); }