/* must store the length of DER. */
/* Return: */
/* ASN1_MEM_ERROR when DER isn't big enough */
-/* ASN1_SUCCESS otherwise */
+/* ASN1_SUCCESS if succesful */
+/* or an error value. */
/******************************************************/
static int
_asn1_objectid_der (unsigned char *str, unsigned char *der, int *der_len)
/* der: string with the DER coding. */
/* node: pointer to the SET element. */
/* Return: */
+/* ASN1_SUCCESS if successful */
+/* or an error value. */
/******************************************************/
-static void
+static int
_asn1_ordering_set (unsigned char *der, int der_len, asn1_node node)
{
struct vet
counter = 0;
if (type_field (node->type) != ASN1_ETYPE_SET)
- return;
+ return ASN1_VALUE_NOT_VALID;
p = node->down;
while (p && ((type_field (p->type) == ASN1_ETYPE_TAG) ||
p = p->right;
if ((p == NULL) || (p->right == NULL))
- return;
+ return ASN1_SUCCESS;
first = last = NULL;
while (p)
{
p_vet = malloc (sizeof (struct vet));
if (p_vet == NULL)
- return;
+ return ASN1_MEM_ALLOC_ERROR;
p_vet->next = NULL;
p_vet->prev = last;
if (asn1_get_tag_der
(der + counter, der_len - counter, &class, &len2,
&tag) != ASN1_SUCCESS)
- return;
+ return ASN1_DER_ERROR;
t = class << 24;
p_vet->value = t | tag;
/* extraction and length */
len2 = asn1_get_length_der (der + counter, der_len - counter, &len);
if (len2 < 0)
- return;
+ return ASN1_DER_ERROR;
counter += len + len2;
p_vet->end = counter;
/* change position */
temp = malloc (p_vet->end - counter);
if (temp == NULL)
- return;
+ return ASN1_MEM_ALLOC_ERROR;
memcpy (temp, der + counter, p_vet->end - counter);
memcpy (der + counter, der + p_vet->end,
free (p_vet);
p_vet = first;
}
+ return ASN1_SUCCESS;
}
/******************************************************/
/* der: string with the DER coding. */
/* node: pointer to the SET OF element. */
/* Return: */
+/* ASN1_SUCCESS if successful */
+/* or an error value. */
/******************************************************/
-static void
+static int
_asn1_ordering_set_of (unsigned char *der, int der_len, asn1_node node)
{
struct vet
counter = 0;
if (type_field (node->type) != ASN1_ETYPE_SET_OF)
- return;
+ return ASN1_VALUE_NOT_VALID;
p = node->down;
while (p && ((type_field (p->type) == ASN1_ETYPE_TAG) ||
(type_field (p->type) == ASN1_ETYPE_SIZE)))
p = p->right;
- p = p->right;
if ((p == NULL) || (p->right == NULL))
- return;
+ return ASN1_SUCCESS;
first = last = NULL;
while (p)
{
p_vet = malloc (sizeof (struct vet));
if (p_vet == NULL)
- return;
+ return ASN1_MEM_ALLOC_ERROR;
p_vet->next = NULL;
p_vet->prev = last;
if (asn1_get_tag_der
(der + counter, der_len - counter, &class, &len,
NULL) != ASN1_SUCCESS)
- return;
+ return ASN1_DER_ERROR;
counter += len;
len2 = asn1_get_length_der (der + counter, der_len - counter, &len);
if (len2 < 0)
- return;
+ return ASN1_DER_ERROR;
counter += len + len2;
}
/* change position */
temp = malloc (p_vet->end - counter);
if (temp == NULL)
- return;
+ return ASN1_MEM_ALLOC_ERROR;
memcpy (temp, der + counter, (p_vet->end) - counter);
memcpy (der + counter, der + (p_vet->end),
free (p_vet);
p_vet = first;
}
+ return ASN1_SUCCESS;
}
/**
len2 = _asn1_strtol (p->value, NULL, 10);
_asn1_set_value (p, NULL, 0);
if ((type_field (p->type) == ASN1_ETYPE_SET) && (max_len >= 0))
- _asn1_ordering_set (der + len2, counter - len2, p);
+ {
+ err = _asn1_ordering_set (der + len2, counter - len2, p);
+ if (err != ASN1_SUCCESS)
+ goto error;
+ }
asn1_length_der (counter - len2, temp, &len3);
max_len -= len3;
if (max_len >= 0)
if ((type_field (p->type) == ASN1_ETYPE_SET_OF)
&& (counter - len2 > 0) && (max_len >= 0))
{
- _asn1_ordering_set_of (der + len2, max_len - len2, p);
+ err = _asn1_ordering_set_of (der + len2, counter - len2, p);
+ if (err != ASN1_SUCCESS)
+ goto error;
}
asn1_length_der (counter - len2, temp, &len3);
max_len -= len3;