1 files changed, 55 insertions, 18 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_lib.c b/src/lib/libcrypto/asn1/asn1_lib.c
index 97b9b35f4b..5af559ef8d 100644
--- a/src/lib/libcrypto/asn1/asn1_lib.c
+++ b/src/lib/libcrypto/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_get_object(unsigned char **pp, long *plength, int *ptag, int *pclass,
-             long omax)
+int ASN1_const_check_infinite_end(const unsigned char **p, long len)
+        {
+        return _asn1_check_infinite_end(p, len);
+        }
+
+
+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;
 
@@ -141,11 +151,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)
@@ -205,13 +215,22 @@ void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
                         }
                 p += ttag;
                 }
-        if ((constructed == 2) && (length == 0))
-                *(p++)=0x80; /* der_put_length would output 0 instead */
+        if (constructed == 2)
+                *(p++)=0x80;
         else
                 asn1_put_length(&p,length);
         *pp=p;
         }
 
+int ASN1_put_eoc(unsigned char **pp)
+        {
+        unsigned char *p = *pp;
+        *p++ = 0;
+        *p++ = 0;
+        *pp = p;
+        return 2;
+        }
+
 static void asn1_put_length(unsigned char **pp, int length)
         {
         unsigned char *p= *pp;
@@ -249,8 +268,8 @@ int ASN1_object_size(int constructed, int length, int tag)
                         ret++;
                         }
                 }
-        if ((length == 0) && (constructed == 2))
-                ret+=2;
+        if (constructed == 2)
+                return ret + 3;
         ret++;
         if (length > 127)
                 {
@@ -263,11 +282,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);
@@ -282,9 +301,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),
@@ -364,6 +393,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));
@@ -411,7 +448,7 @@ 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];