1 files changed, 13 insertions, 10 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_lib.c b/src/lib/libcrypto/asn1/asn1_lib.c
index be8daa8688..77447a5240 100644
--- a/src/lib/libcrypto/asn1/asn1_lib.c
+++ b/src/lib/libcrypto/asn1/asn1_lib.c
@@ -181,7 +181,7 @@ void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
              int xclass)
         {
         unsigned char *p= *pp;
-        int i;
+        int i, ttag;
 
         i=(constructed)?V_ASN1_CONSTRUCTED:0;
         i|=(xclass&V_ASN1_PRIVATE);
@@ -190,12 +190,15 @@ void ASN1_put_object(unsigned char **pp, int constructed, int length, int tag,
         else
                 {
                 *(p++)=i|V_ASN1_PRIMITIVE_TAG;
-                while (tag > 0x7f)
+                for(i = 0, ttag = tag; ttag > 0; i++) ttag >>=7;
+                ttag = i;
+                while(i-- > 0)
                         {
-                        *(p++)=(tag&0x7f)|0x80;
-                        tag>>=7;
+                        p[i] = tag & 0x7f;
+                        if(i != (ttag - 1)) p[i] |= 0x80;
+                        tag >>= 7;
                         }
-                *(p++)=(tag&0x7f);
+                p += ttag;
                 }
         if ((constructed == 2) && (length == 0))
                 *(p++)=0x80; /* der_put_length would output 0 instead */
@@ -335,9 +338,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)
                         {
@@ -365,7 +368,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 +384,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(a->data);
-        Free(a);
+        if (a->data != NULL) OPENSSL_free(a->data);
+        OPENSSL_free(a);
         }
 
 int ASN1_STRING_cmp(ASN1_STRING *a, ASN1_STRING *b)