- use BN_set_negative and BN_is_negative instead of BN_set_sign
[openssl.git] / crypto / asn1 / a_enum.c
index 7ad863a..fe9aa13 100644 (file)
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/asn1.h>
+#include <openssl/bn.h>
 
-/* Support for ASN1 ENUMERATED type: based on a_int.c */
-
-/* ASN1err(ASN1_F_D2I_ASN1_ENUMERATED,ASN1_R_EXPECTING_AN_ENUMERATED);
+/* 
+ * Code for ENUMERATED type: identical to INTEGER apart from a different tag.
+ * for comments on encoding see a_int.c
  */
 
-int i2d_ASN1_ENUMERATED(ASN1_ENUMERATED *a, unsigned char **pp)
-       {
-       int pad=0,ret,r,i,t;
-       unsigned char *p,*pt,*n,pb=0;
-
-       if ((a == NULL) || (a->data == NULL)) return(0);
-       t=a->type;
-       if (a->length == 0)
-               ret=1;
-       else
-               {
-               ret=a->length;
-               i=a->data[0];
-               if ((t == V_ASN1_ENUMERATED) && (i > 127))
-                       {
-                       pad=1;
-                       pb=0;
-                       }
-               else if ((t == V_ASN1_NEG_ENUMERATED) && (i>128))
-                       {
-                       pad=1;
-                       pb=0xFF;
-                       }
-               ret+=pad;
-               }
-       r=ASN1_object_size(0,ret,V_ASN1_ENUMERATED);
-       if (pp == NULL) return(r);
-       p= *pp;
-
-       ASN1_put_object(&p,0,ret,V_ASN1_ENUMERATED,V_ASN1_UNIVERSAL);
-       if (pad) *(p++)=pb;
-       if (a->length == 0)
-               *(p++)=0;
-       else if (t == V_ASN1_ENUMERATED)
-               {
-               memcpy(p,a->data,(unsigned int)a->length);
-               p+=a->length;
-               }
-       else
-               {
-               n=a->data;
-               pt=p;
-               for (i=a->length; i>0; i--)
-                       *(p++)= (*(n++)^0xFF)+1;
-               if (!pad) *pt|=0x80;
-               }
-
-       *pp=p;
-       return(r);
-       }
-
-ASN1_ENUMERATED *d2i_ASN1_ENUMERATED(ASN1_ENUMERATED **a, unsigned char **pp,
-            long length)
-       {
-       ASN1_ENUMERATED *ret=NULL;
-       unsigned char *p,*to,*s;
-       long len;
-       int inf,tag,xclass;
-       int i;
-
-       if ((a == NULL) || ((*a) == NULL))
-               {
-               if ((ret=ASN1_ENUMERATED_new()) == NULL) return(NULL);
-               ret->type=V_ASN1_ENUMERATED;
-               }
-       else
-               ret=(*a);
-
-       p= *pp;
-       inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
-       if (inf & 0x80)
-               {
-               i=ASN1_R_BAD_OBJECT_HEADER;
-               goto err;
-               }
-
-       if (tag != V_ASN1_ENUMERATED)
-               {
-               i=ASN1_R_EXPECTING_AN_ENUMERATED;
-               goto err;
-               }
-
-       /* We must Malloc stuff, even for 0 bytes otherwise it
-        * signifies a missing NULL parameter. */
-       s=(unsigned char *)Malloc((int)len+1);
-       if (s == NULL)
-               {
-               i=ERR_R_MALLOC_FAILURE;
-               goto err;
-               }
-       to=s;
-       if (*p & 0x80) /* a negative number */
-               {
-               ret->type=V_ASN1_NEG_ENUMERATED;
-               if (*p == 0xff)
-                       {
-                       p++;
-                       len--;
-                       }
-               for (i=(int)len; i>0; i--)
-                       *(to++)= (*(p++)^0xFF)+1;
-               }
-       else
-               {
-               ret->type=V_ASN1_ENUMERATED;
-               if ((*p == 0) && (len != 1))
-                       {
-                       p++;
-                       len--;
-                       }
-               memcpy(s,p,(int)len);
-               p+=len;
-               }
-
-       if (ret->data != NULL) Free((char *)ret->data);
-       ret->data=s;
-       ret->length=(int)len;
-       if (a != NULL) (*a)=ret;
-       *pp=p;
-       return(ret);
-err:
-       ASN1err(ASN1_F_D2I_ASN1_ENUMERATED,i);
-       if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-               ASN1_ENUMERATED_free(ret);
-       return(NULL);
-       }
-
 int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v)
        {
-       int i,j,k;
+       int j,k;
+       unsigned int i;
        unsigned char buf[sizeof(long)+1];
        long d;
 
        a->type=V_ASN1_ENUMERATED;
-       if (a->length < (sizeof(long)+1))
+       if (a->length < (int)(sizeof(long)+1))
                {
                if (a->data != NULL)
-                       Free((char *)a->data);
-               if ((a->data=(unsigned char *)Malloc(sizeof(long)+1)) != NULL)
+                       OPENSSL_free(a->data);
+               if ((a->data=(unsigned char *)OPENSSL_malloc(sizeof(long)+1)) != NULL)
                        memset((char *)a->data,0,sizeof(long)+1);
                }
        if (a->data == NULL)
@@ -225,7 +100,6 @@ int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v)
                d>>=8;
                }
        j=0;
-       if (v < 0) a->data[j++]=0;
        for (k=i-1; k >=0; k--)
                a->data[j++]=buf[k];
        a->length=j;
@@ -242,15 +116,15 @@ long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a)
        if (i == V_ASN1_NEG_ENUMERATED)
                neg=1;
        else if (i != V_ASN1_ENUMERATED)
-               return(0);
+               return -1;
        
-       if (a->length > sizeof(long))
+       if (a->length > (int)sizeof(long))
                {
                /* hmm... a bit ugly */
                return(0xffffffffL);
                }
        if (a->data == NULL)
-               return(0);
+               return 0;
 
        for (i=0; i<a->length; i++)
                {
@@ -267,7 +141,7 @@ ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
        int len,j;
 
        if (ai == NULL)
-               ret=ASN1_ENUMERATED_new();
+               ret=M_ASN1_ENUMERATED_new();
        else
                ret=ai;
        if (ret == NULL)
@@ -275,14 +149,25 @@ ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai)
                ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_NESTED_ASN1_ERROR);
                goto err;
                }
-       ret->type=V_ASN1_ENUMERATED;
+       if(BN_is_negative(bn)) ret->type = V_ASN1_NEG_ENUMERATED;
+       else ret->type=V_ASN1_ENUMERATED;
        j=BN_num_bits(bn);
        len=((j == 0)?0:((j/8)+1));
-       ret->data=(unsigned char *)Malloc(len+4);
+       if (ret->length < len+4)
+               {
+               unsigned char *new_data=OPENSSL_realloc(ret->data, len+4);
+               if (!new_data)
+                       {
+                       ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_MALLOC_FAILURE);
+                       goto err;
+                       }
+               ret->data=new_data;
+               }
+
        ret->length=BN_bn2bin(bn,ret->data);
        return(ret);
 err:
-       if (ret != ai) ASN1_ENUMERATED_free(ret);
+       if (ret != ai) M_ASN1_ENUMERATED_free(ret);
        return(NULL);
        }
 
@@ -292,5 +177,6 @@ BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn)
 
        if ((ret=BN_bin2bn(ai->data,ai->length,bn)) == NULL)
                ASN1err(ASN1_F_ASN1_ENUMERATED_TO_BN,ASN1_R_BN_LIB);
+       else if(ai->type == V_ASN1_NEG_ENUMERATED) BN_set_negative(ret,1);
        return(ret);
        }