#include <stdio.h>
#include "cryptlib.h"
-#include "asn1.h"
+#include <openssl/asn1.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;
+ASN1_ENUMERATED *ASN1_ENUMERATED_new(void)
+{ return M_ASN1_ENUMERATED_new(); }
- 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;
+void ASN1_ENUMERATED_free(ASN1_ENUMERATED *x)
+{ M_ASN1_ENUMERATED_free(x); }
- 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);
+int i2d_ASN1_ENUMERATED(ASN1_ENUMERATED *a, unsigned char **pp)
+{
+ int len, ret;
+ len = i2c_ASN1_INTEGER(a, NULL);
+ ret=ASN1_object_size(0,len,V_ASN1_ENUMERATED);
+ if(pp) {
+ ASN1_put_object(pp,0,ret,V_ASN1_ENUMERATED,V_ASN1_UNIVERSAL);
+ i2c_ASN1_INTEGER(a, pp);
}
+ return ret;
+}
ASN1_ENUMERATED *d2i_ASN1_ENUMERATED(ASN1_ENUMERATED **a, unsigned char **pp,
long length)
- {
- ASN1_ENUMERATED *ret=NULL;
- unsigned char *p,*to,*s;
+{
+ unsigned char *p;
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);
+ int inf,tag,xclass;
+ ASN1_ENUMERATED *ret;
p= *pp;
inf=ASN1_get_object(&p,&len,&tag,&xclass,length);
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);
+ ret = c2i_ASN1_INTEGER(a, &p, len);
+ if(ret) {
+ ret->type = (V_ASN1_NEG & ret->type) | V_ASN1_ENUMERATED;
+ *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)
{
if (a->length < (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)
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;
int len,j;
if (ai == NULL)
- ret=ASN1_ENUMERATED_new();
+ ret=M_ASN1_ENUMERATED_new();
else
ret=ai;
if (ret == NULL)
ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_NESTED_ASN1_ERROR);
goto err;
}
- ret->type=V_ASN1_ENUMERATED;
+ if(bn->neg) 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);
+ ret->data=(unsigned char *)OPENSSL_malloc(len+4);
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);
}
if ((ret=BN_bin2bn(ai->data,ai->length,bn)) == NULL)
ASN1err(ASN1_F_ASN1_ENUMERATED_TO_BN,ASN1_R_BN_LIB);
+ if(ai->type == V_ASN1_NEG_ENUMERATED) bn->neg = 1;
return(ret);
}
projects / openssl.git / blobdiff