Use basename of objxref.pl not whole path in generated header.

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

diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 504e612a853b4231d68d8f13d8a30f2667a59bd2..1bcb44aee203637ec70a60fe616588696bac32ac 100644 (file)
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -64,7 +64,7 @@
 
 static int asn1_get_length(const unsigned char **pp,int *inf,long *rl,int max);
 static void asn1_put_length(unsigned char **pp, int length);
-const char *ASN1_version="ASN.1" OPENSSL_VERSION_PTEXT;
+const char ASN1_version[]="ASN.1" OPENSSL_VERSION_PTEXT;
 
 static int _asn1_check_infinite_end(const unsigned char **p, long len)
        {
@@ -340,20 +340,31 @@ int asn1_GetSequence(ASN1_const_CTX *c, long *length)
        return(1);
        }
 
-ASN1_STRING *ASN1_STRING_dup(ASN1_STRING *str)
+int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str)
        {
-       ASN1_STRING *ret;
+       if (str == NULL)
+               return 0;
+       dst->type = str->type;
+       if (!ASN1_STRING_set(dst,str->data,str->length))
+               return 0;
+       dst->flags = str->flags;
+       return 1;
+       }
 
-       if (str == NULL) return(NULL);
-       if ((ret=ASN1_STRING_type_new(str->type)) == NULL)
-               return(NULL);
-       if (!ASN1_STRING_set(ret,str->data,str->length))
+ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *str)
+       {
+       ASN1_STRING *ret;
+       if (!str)
+                return NULL;
+       ret=ASN1_STRING_new();
+       if (!ret)
+               return NULL;
+       if (!ASN1_STRING_copy(ret,str))
                {
                ASN1_STRING_free(ret);
-               return(NULL);
+               return NULL;
                }
-       ret->flags = str->flags;
-       return(ret);
+       return ret;
        }
 
 int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
@@ -378,6 +389,7 @@ int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
 
                if (str->data == NULL)
                        {
+                       ASN1err(ASN1_F_ASN1_STRING_SET,ERR_R_MALLOC_FAILURE);
                        str->data=c;
                        return(0);
                        }
@@ -392,6 +404,14 @@ int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
        return(1);
        }
 
+void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len)
+       {
+       if (str->data)
+               OPENSSL_free(str->data);
+       str->data = data;
+       str->length = len;
+       }
+
 ASN1_STRING *ASN1_STRING_new(void)
        {
        return(ASN1_STRING_type_new(V_ASN1_OCTET_STRING));
@@ -418,11 +438,12 @@ ASN1_STRING *ASN1_STRING_type_new(int type)
 void ASN1_STRING_free(ASN1_STRING *a)
        {
        if (a == NULL) return;
-       if (a->data != NULL) OPENSSL_free(a->data);
+       if (a->data && !(a->flags & ASN1_STRING_FLAG_NDEF))
+               OPENSSL_free(a->data);
        OPENSSL_free(a);
        }
 
-int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)
+int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b)
        {
        int i;
 
@@ -448,7 +469,7 @@ void asn1_add_error(const unsigned char *address, int offset)
        ERR_add_error_data(4,"address=",buf1," offset=",buf2);
        }
 
-int ASN1_STRING_length(ASN1_STRING *x)
+int ASN1_STRING_length(const ASN1_STRING *x)
 { return M_ASN1_STRING_length(x); }
 
 void ASN1_STRING_length_set(ASN1_STRING *x, int len)