Synchronise the VMS build with the Unix one.

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

diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c
index cd4d835003cad6dcadc75a996f79a22faa3917e7..7013a407ad68385d0f82c27ec6d4aed864f5d4ea 100644 (file)
--- a/crypto/asn1/a_bitstr.c
+++ b/crypto/asn1/a_bitstr.c
@@ -58,20 +58,39 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1.h"
+#include <openssl/asn1.h>
 
-/* ASN1err(ASN1_F_ASN1_STRING_NEW,ASN1_R_STRING_TOO_SHORT);
- * ASN1err(ASN1_F_D2I_ASN1_BIT_STRING,ASN1_R_EXPECTING_A_BIT_STRING);
- */
+ASN1_BIT_STRING *ASN1_BIT_STRING_new(void)
+{ return M_ASN1_BIT_STRING_new(); }
+
+void ASN1_BIT_STRING_free(ASN1_BIT_STRING *x)
+{ M_ASN1_BIT_STRING_free(x); }
+
+int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
+{ return M_ASN1_BIT_STRING_set(x, d, len); }
 
 int i2d_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
+{
+       int len, ret;
+       len = i2c_ASN1_BIT_STRING(a, NULL);     
+       ret=ASN1_object_size(0,len,V_ASN1_BIT_STRING);
+       if(pp) {
+               ASN1_put_object(pp,0,len,V_ASN1_BIT_STRING,V_ASN1_UNIVERSAL);
+               i2c_ASN1_BIT_STRING(a, pp);     
+       }
+       return ret;
+}
+
+int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
        {
-       int ret,j,r,bits,len;
+       int ret,j,bits,len;
        unsigned char *p,*d;
 
        if (a == NULL) return(0);
 
        len=a->length;
+       ret=1+len;
+       if (pp == NULL) return(ret);
 
        if (len > 0)
                {
@@ -99,36 +118,27 @@ int i2d_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp)
                }
        else
                bits=0;
-       ret=1+len;
-       r=ASN1_object_size(0,ret,V_ASN1_BIT_STRING);
-       if (pp == NULL) return(r);
        p= *pp;
 
-       ASN1_put_object(&p,0,ret,V_ASN1_BIT_STRING,V_ASN1_UNIVERSAL);
        *(p++)=(unsigned char)bits;
        d=a->data;
        memcpy(p,d,len);
        p+=len;
        if (len > 0) p[-1]&=(0xff<<bits);
        *pp=p;
-       return(r);
+       return(ret);
        }
 
+
+/* Convert DER encoded ASN1 BIT_STRING to ASN1_BIT_STRING structure */
 ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp,
             long length)
-       {
-       ASN1_BIT_STRING *ret=NULL;
-       unsigned char *p,*s;
+{
+       unsigned char *p;
        long len;
-       int inf,tag,xclass;
        int i;
-
-       if ((a == NULL) || ((*a) == NULL))
-               {
-               if ((ret=ASN1_BIT_STRING_new()) == NULL) return(NULL);
-               }
-       else
-               ret=(*a);
+       int inf,tag,xclass;
+       ASN1_BIT_STRING *ret;
 
        p= *pp;
        inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
@@ -144,7 +154,30 @@ ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp,
                goto err;
                }
        if (len < 1) { i=ASN1_R_STRING_TOO_SHORT; goto err; }
+       ret = c2i_ASN1_BIT_STRING(a, &p, len);
+       if(ret) *pp = p;
+       return ret;
+err:
+       ASN1err(ASN1_F_D2I_ASN1_BIT_STRING,i);
+       return(NULL);
+
+}
+
+ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp,
+            long len)
+       {
+       ASN1_BIT_STRING *ret=NULL;
+       unsigned char *p,*s;
+       int i;
 
+       if ((a == NULL) || ((*a) == NULL))
+               {
+               if ((ret=M_ASN1_BIT_STRING_new()) == NULL) return(NULL);
+               }
+       else
+               ret=(*a);
+
+       p= *pp;
        i= *(p++);
        /* We do this to preserve the settings.  If we modify
         * the settings, via the _set_bit function, we will recalculate
@@ -154,7 +187,7 @@ ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp,
 
        if (len-- > 1) /* using one because of the bits left byte */
                {
-               s=(unsigned char *)Malloc((int)len);
+               s=(unsigned char *)OPENSSL_malloc((int)len);
                if (s == NULL)
                        {
                        i=ERR_R_MALLOC_FAILURE;
@@ -168,7 +201,7 @@ ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp,
                s=NULL;
 
        ret->length=(int)len;
-       if (ret->data != NULL) Free((char *)ret->data);
+       if (ret->data != NULL) OPENSSL_free(ret->data);
        ret->data=s;
        ret->type=V_ASN1_BIT_STRING;
        if (a != NULL) (*a)=ret;
@@ -177,7 +210,7 @@ ASN1_BIT_STRING *d2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a, unsigned char **pp,
 err:
        ASN1err(ASN1_F_D2I_ASN1_BIT_STRING,i);
        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-               ASN1_BIT_STRING_free(ret);
+               M_ASN1_BIT_STRING_free(ret);
        return(NULL);
        }
 
@@ -199,14 +232,14 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value)
                {
                if (!value) return(1); /* Don't need to set */
                if (a->data == NULL)
-                       c=(unsigned char *)Malloc(w+1);
+                       c=(unsigned char *)OPENSSL_malloc(w+1);
                else
-                       c=(unsigned char *)Realloc(a->data,w+1);
+                       c=(unsigned char *)OPENSSL_realloc(a->data,w+1);
                if (c == NULL) return(0);
+               if (w+1-a->length > 0) memset(c+a->length, 0, w+1-a->length);
                a->data=c;
                a->length=w+1;
-               c[w]=0;
-               }
+       }
        a->data[w]=((a->data[w])&iv)|v;
        while ((a->length > 0) && (a->data[a->length-1] == 0))
                a->length--;