#include <stdio.h>
#include "cryptlib.h"
-#include "asn1.h"
-#include "asn1_mac.h"
+#include <openssl/asn1.h>
+#include <openssl/asn1_mac.h>
-#ifndef NOPROTO
static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max);
static void asn1_put_length(unsigned char **pp, int length);
-#else
-static int asn1_get_length();
-static void asn1_put_length();
-#endif
-
const char *ASN1_version="ASN.1" OPENSSL_VERSION_PTEXT;
int ASN1_check_infinite_end(unsigned char **p, long len)
if (!max) goto err;
ret=(*p&V_ASN1_CONSTRUCTED);
xclass=(*p&V_ASN1_PRIVATE);
- i= *p&V_ASN1_PRIMATIVE_TAG;
- if (i == V_ASN1_PRIMATIVE_TAG)
+ i= *p&V_ASN1_PRIMITIVE_TAG;
+ if (i == V_ASN1_PRIMITIVE_TAG)
{ /* high-tag */
p++;
if (--max == 0) goto err;
i=(constructed)?V_ASN1_CONSTRUCTED:0;
i|=(xclass&V_ASN1_PRIVATE);
if (tag < 31)
- *(p++)=i|(tag&V_ASN1_PRIMATIVE_TAG);
+ *(p++)=i|(tag&V_ASN1_PRIMITIVE_TAG);
else
{
- *(p++)=i|V_ASN1_PRIMATIVE_TAG;
+ *(p++)=i|V_ASN1_PRIMITIVE_TAG;
while (tag > 0x7f)
{
*(p++)=(tag&0x7f)|0x80;
ASN1_STRING_free(ret);
return(NULL);
}
+ ret->flags = str->flags;
return(ret);
}
-int ASN1_STRING_set(ASN1_STRING *str, unsigned char *data, int len)
+int ASN1_STRING_set(ASN1_STRING *str, const void *_data, int len)
{
- char *c;
+ unsigned char *c;
+ const char *data=_data;
if (len < 0)
{
if (data == NULL)
return(0);
else
- len=strlen((char *)data);
+ len=strlen(data);
}
if ((str->length < len) || (str->data == NULL))
{
- c=(char *)str->data;
+ c=str->data;
if (c == NULL)
- str->data=(unsigned char *)Malloc(len+1);
+ str->data=Malloc(len+1);
else
- str->data=(unsigned char *)Realloc(c,len+1);
+ str->data=Realloc(c,len+1);
if (str->data == NULL)
{
- str->data=(unsigned char *)c;
+ str->data=c;
return(0);
}
}