Pass phrase reorganisation.

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

diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 7fd9f53b0ea632e7caf5e0a0c90935e735d0f39c..be8daa8688dd109444be74b0012aa6675dd880ef 100644 (file)
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -92,8 +92,8 @@ int ASN1_get_object(unsigned char **pp, long *plength, int *ptag, int *pclass,
        if (!max) goto err;
        ret=(*p&V_ASN1_CONSTRUCTED);
        xclass=(*p&V_ASN1_PRIVATE);
-       i= *p&V_ASN1_PRIMATIVE_TAG;
-       if (i == V_ASN1_PRIMATIVE_TAG)
+       i= *p&V_ASN1_PRIMITIVE_TAG;
+       if (i == V_ASN1_PRIMITIVE_TAG)
                {               /* high-tag */
                p++;
                if (--max == 0) goto err;
@@ -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)
        {
@@ -186,10 +186,10 @@ void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
        i=(constructed)?V_ASN1_CONSTRUCTED:0;
        i|=(xclass&V_ASN1_PRIVATE);
        if (tag < 31)
-               *(p++)=i|(tag&V_ASN1_PRIMATIVE_TAG);
+               *(p++)=i|(tag&V_ASN1_PRIMITIVE_TAG);
        else
                {
-               *(p++)=i|V_ASN1_PRIMATIVE_TAG;
+               *(p++)=i|V_ASN1_PRIMITIVE_TAG;
                while (tag > 0x7f)
                        {
                        *(p++)=(tag&0x7f)|0x80;
@@ -315,6 +315,7 @@ ASN1_STRING *ASN1_STRING_dup(ASN1_STRING *str)
                ASN1_STRING_free(ret);
                return(NULL);
                }
+       ret->flags = str->flags;
        return(ret);
        }
 
@@ -348,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);
@@ -380,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) Free(a->data);
+       Free(a);
        }
 
 int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)
@@ -410,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); }