Prepare for 0.9.8ze-dev

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

diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c
index 3f7b3aad2ad37d5ceb883c254ea65572a74374e8..d34515577e6eb8226d1d25748a28f9f112e1ffba 100644 (file)
--- a/crypto/asn1/asn1_lib.c
+++ b/crypto/asn1/asn1_lib.c
@@ -62,11 +62,11 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1_mac.h>
 
-static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max);
+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;
 
-int ASN1_check_infinite_end(unsigned char **p, long len)
+static int _asn1_check_infinite_end(const unsigned char **p, long len)
        {
        /* If there is 0 or 1 byte left, the length check should pick
         * things up */
@@ -80,13 +80,23 @@ int ASN1_check_infinite_end(unsigned char **p, long len)
        return(0);
        }
 
+int ASN1_check_infinite_end(unsigned char **p, long len)
+       {
+       return _asn1_check_infinite_end((const unsigned char **)p, len);
+       }
+
+int ASN1_const_check_infinite_end(const unsigned char **p, long len)
+       {
+       return _asn1_check_infinite_end(p, len);
+       }
+
 
-int ASN1_get_object(unsigned char **pp, long *plength, int *ptag, int *pclass,
-            long omax)
+int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
+       int *pclass, long omax)
        {
        int i,ret;
        long l;
-       unsigned char *p= *pp;
+       const unsigned char *p= *pp;
        int tag,xclass,inf;
        long max=omax;
 
@@ -104,10 +114,12 @@ int ASN1_get_object(unsigned char **pp, long *plength, int *ptag, int *pclass,
                        l<<=7L;
                        l|= *(p++)&0x7f;
                        if (--max == 0) goto err;
+                       if (l > (INT_MAX >> 7L)) goto err;
                        }
                l<<=7L;
                l|= *(p++)&0x7f;
                tag=(int)l;
+               if (--max == 0) goto err;
                }
        else
                { 
@@ -119,6 +131,9 @@ int ASN1_get_object(unsigned char **pp, long *plength, int *ptag, int *pclass,
        *pclass=xclass;
        if (!asn1_get_length(&p,&inf,plength,(int)max)) goto err;
 
+       if (inf && !(ret & V_ASN1_CONSTRUCTED))
+               goto err;
+
 #if 0
        fprintf(stderr,"p=%d + *plength=%ld > omax=%ld + *pp=%d  (%d > %d)\n", 
                (int)p,*plength,omax,(int)*pp,(int)(p+ *plength),
@@ -139,11 +154,11 @@ err:
        return(0x80);
        }
 
-static int asn1_get_length(unsigned char **pp, int *inf, long *rl, int max)
+static int asn1_get_length(const unsigned char **pp, int *inf, long *rl, int max)
        {
-       unsigned char *p= *pp;
+       const unsigned char *p= *pp;
        unsigned long ret=0;
-       int i;
+       unsigned int i;
 
        if (max-- < 1) return(0);
        if (*p == 0x80)
@@ -270,11 +285,11 @@ int ASN1_object_size(int constructed, int length, int tag)
        return(ret);
        }
 
-int asn1_Finish(ASN1_CTX *c)
+static int _asn1_Finish(ASN1_const_CTX *c)
        {
        if ((c->inf == (1|V_ASN1_CONSTRUCTED)) && (!c->eos))
                {
-               if (!ASN1_check_infinite_end(&c->p,c->slen))
+               if (!ASN1_const_check_infinite_end(&c->p,c->slen))
                        {
                        c->error=ERR_R_MISSING_ASN1_EOS;
                        return(0);
@@ -289,9 +304,19 @@ int asn1_Finish(ASN1_CTX *c)
        return(1);
        }
 
-int asn1_GetSequence(ASN1_CTX *c, long *length)
+int asn1_Finish(ASN1_CTX *c)
+       {
+       return _asn1_Finish((ASN1_const_CTX *)c);
+       }
+
+int asn1_const_Finish(ASN1_const_CTX *c)
        {
-       unsigned char *q;
+       return _asn1_Finish(c);
+       }
+
+int asn1_GetSequence(ASN1_const_CTX *c, long *length)
+       {
+       const unsigned char *q;
 
        q=c->p;
        c->inf=ASN1_get_object(&(c->p),&(c->slen),&(c->tag),&(c->xclass),
@@ -356,6 +381,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);
                        }
@@ -370,6 +396,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));
@@ -417,12 +451,12 @@ int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)
                return(i);
        }
 
-void asn1_add_error(unsigned char *address, int offset)
+void asn1_add_error(const unsigned char *address, int offset)
        {
        char buf1[DECIMAL_SIZE(address)+1],buf2[DECIMAL_SIZE(offset)+1];
 
-       sprintf(buf1,"%lu",(unsigned long)address);
-       sprintf(buf2,"%d",offset);
+       BIO_snprintf(buf1,sizeof buf1,"%lu",(unsigned long)address);
+       BIO_snprintf(buf2,sizeof buf2,"%d",offset);
        ERR_add_error_data(4,"address=",buf1," offset=",buf2);
        }