Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2003 - 2005 Pekka Riikonen
+ Copyright (C) 2003 - 2007 Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "silcasn1.h"
#include "silcber.h"
+#define SILC_ASN1_STACK(stack, asn1) stack ? stack : asn1->orig_stack
/************************** ASN.1 Decoder routines **************************/
SilcList types;
SilcAsn1Tag type;
SilcBuffer *retb;
- SilcUInt32 *retc;
- SilcAsn1Tag rtag;
+ SilcUInt32 *retc, rtag;
const unsigned char *rdata;
- SilcUInt32 rdata_len, len = 0;
- SilcBool found = FALSE, rindef;
+ SilcUInt32 rdata_len, len = 0, *choice_index = NULL;
+ SilcBool found = FALSE, rindef, chosen = FALSE;
struct SilcAsn1SofStruct {
SilcAsn1Tag type;
if (type == SILC_ASN1_TAG_CHOICE) {
/* The sequence may consist of the following types. */
+ choice_index = va_arg(asn1->ap, SilcUInt32 *);
+ *choice_index = 0;
+
type = va_arg(asn1->ap, SilcUInt32);
assert(type != SILC_ASN1_END);
while (type != SILC_ASN1_END) {
- t = silc_smalloc(asn1->stack1, sizeof(*t));
+ t = silc_smalloc(SILC_ASN1_STACK(asn1->stack1, asn1), sizeof(*t));
if (!t)
goto out;
t->type = type;
}
} else {
/* The sequence consists of this type. */
- t = silc_smalloc(asn1->stack1, sizeof(*t));
+ t = silc_smalloc(SILC_ASN1_STACK(asn1->stack1, asn1), sizeof(*t));
if (!t)
goto out;
t->type = type;
assert(type == SILC_ASN1_END);
/* Decode the SEQUENCE or SET */
- ret = silc_ber_decode(src, NULL, NULL, (SilcUInt32 *)&rtag, &rdata,
+ ret = silc_ber_decode(src, NULL, NULL, &rtag, &rdata,
&rdata_len, &rindef, &len);
if (!ret) {
SILC_LOG_DEBUG(("Error parsing BER block, malformed ASN.1 data"));
while (silc_buffer_len(src)) {
/* Decode the BER data. */
- ret = silc_ber_decode(src, NULL, NULL, (SilcUInt32 *)&rtag, &rdata,
+ ret = silc_ber_decode(src, NULL, NULL, &rtag, &rdata,
&rdata_len, &rindef, &len);
if (!ret) {
SILC_LOG_DEBUG(("Error parsing BER block, malformed ASN.1 data"));
found = FALSE;
silc_list_start(types);
while ((t = silc_list_get(types)) != SILC_LIST_END) {
+ if (choice_index && !chosen)
+ (*choice_index)++;
+
if (t->type != rtag)
continue;
- *retb = silc_srealloc(asn1->stack1, sizeof(**retb) * (*retc), *retb,
+ *retb = silc_srealloc(SILC_ASN1_STACK(asn1->stack1, asn1),
+ sizeof(**retb) * (*retc), *retb,
sizeof(**retb) * (*retc + 1));
if (*retb == NULL)
goto out;
SILC_LOG_DEBUG(("Decode %s [%d] from sequence of types",
silc_asn1_tag_name(rtag), rtag));
- /* Data is duplicated only if SILC_ASN1_ALLOC flag is set */
+ /* Data is duplicated only if SILC_ASN1_ALLOC flag is set, ie.
+ asn1->stack1 == NULL */
if (!asn1->stack1)
- rdata = silc_memdup(rdata - len, rdata_len + len);
+ rdata = silc_smemdup(asn1->orig_stack, rdata - len, rdata_len + len);
else
rdata = rdata - len;
rdata_len += len;
silc_buffer_set(&(*retb)[*retc], (unsigned char *)rdata, rdata_len);
(*retc)++;
found = TRUE;
+ chosen = TRUE;
break;
}
if (!asn1->stack1) {
silc_list_start(types);
while ((t = silc_list_get(types)) != SILC_LIST_END)
- silc_free(t);
+ silc_sfree(asn1->orig_stack, t);
}
return ret;
} \
if (name == NULL) \
break; \
- *name = silc_scalloc(asn1->stack1, 1, sizeof(**name)); \
+ *name = silc_scalloc(SILC_ASN1_STACK(stack1, asn1), \
+ 1, sizeof(**name)); \
if (*name == NULL) \
break; \
} else { \
#define SILC_ASN1_VA_FREE(opts, name) \
if ((opts) & SILC_ASN1_OPTIONAL) \
- silc_free(*name);
+ silc_sfree(SILC_ASN1_STACK(stack1, asn1), *name);
/* Decodes string to UTF-8 string which is our internal representation
of any string. */
ret = FALSE; \
goto fail; \
} \
- *s = silc_smalloc_ua(stack1, *s_len + 1); \
+ *s = silc_smalloc(SILC_ASN1_STACK(stack1, asn1), *s_len + 1); \
if (*s) { \
silc_utf8_encode(rdata, rdata_len, (enc), *s, *s_len); \
(*s)[*s_len] = '\0'; \
SilcBool primitive)
{
unsigned char *ptr = src->data;
- SilcAsn1Tag rtype, rtag;
+ SilcAsn1Tag rtype;
SilcAsn1Options ropts;
SilcBerClass rclass;
SilcBerEncoding renc;
- SilcUInt32 len = 0;
+ SilcUInt32 len = 0, rtag;
SilcBool ret, indef, rindef, found = FALSE, choice = FALSE;
+ SilcBool choice_found = FALSE;
const unsigned char *rdata;
- SilcUInt32 rdata_len;
+ SilcUInt32 rdata_len, *choice_index = NULL;
int i;
#ifdef SILC_DEBUG
indef = (opts & SILC_ASN1_INDEFINITE ? TRUE : FALSE);
/* By default UNIVERSAL is implied unless the following conditions
- are met when CONTEXT will apply. */
+ are met when CONTEXT will apply. For SILC_ASN1_TAG_ANY_PRIMITIVE
+ the class is changed only if flags dictate it. */
if (ber_class == SILC_BER_CLASS_UNIVERSAL) {
- if (tag != type ||
- opts & SILC_ASN1_IMPLICIT ||
- opts & SILC_ASN1_EXPLICIT)
- ber_class = SILC_BER_CLASS_CONTEXT;
+ if (type == SILC_ASN1_TAG_ANY_PRIMITIVE) {
+ if (opts & SILC_ASN1_IMPLICIT ||
+ opts & SILC_ASN1_EXPLICIT)
+ ber_class = SILC_BER_CLASS_CONTEXT;
+ } else {
+ if (tag != type ||
+ opts & SILC_ASN1_IMPLICIT ||
+ opts & SILC_ASN1_EXPLICIT)
+ ber_class = SILC_BER_CLASS_CONTEXT;
+ }
}
+ /* Short integer is actually big integer in the BER data, so handle
+ it correctly */
+ if (type == SILC_ASN1_TAG_SHORT_INTEGER && type == tag)
+ tag = SILC_ASN1_TAG_INTEGER;
+
/* Now decode a BER encoded block from the source buffer. It must be
exactly the same user is expecting. */
- ret = silc_ber_decode(src, &rclass, &renc, (SilcUInt32 *)&rtag, &rdata,
+ ret = silc_ber_decode(src, &rclass, &renc, &rtag, &rdata,
&rdata_len, &rindef, &len);
if (!ret) {
SILC_LOG_DEBUG(("Error parsing BER block, malformed ASN.1 data"));
having OPTIONAL flag set, except that at the end one must have
been found. */
if (type == SILC_ASN1_TAG_CHOICE) {
+ choice_index = va_arg(asn1->ap, SilcUInt32 *);
+ *choice_index = 0;
choice = TRUE;
SILC_ASN1_ARGS(asn1, type, tag, ber_class, opts);
opts |= SILC_ASN1_OPTIONAL;
the node */
SILC_ASN1_VAD(asn1, opts, SilcBufferStruct, node);
- *node = silc_buffer_srealloc_size(stack1, *node, len + rdata_len);
+ *node = silc_buffer_srealloc_size(SILC_ASN1_STACK(stack1, asn1),
+ *node, len + rdata_len);
silc_buffer_put(*node, rdata - len, rdata_len + len);
break;
}
+ case SILC_ASN1_TAG_ANY_PRIMITIVE:
+ {
+ /* ANY_PRIMITIVE returns the raw data blob of any primitive type. */
+ SILC_ASN1_VAD(asn1, opts, SilcBufferStruct, prim);
+
+ *prim = silc_buffer_srealloc_size(SILC_ASN1_STACK(stack1, asn1),
+ *prim, rdata_len);
+ silc_buffer_put(*prim, rdata, rdata_len);
+ break;
+ }
+
case SILC_ASN1_TAG_SEQUENCE:
case SILC_ASN1_TAG_SET:
{
SILC_ASN1_ARGS(asn1, rtype, rtag, rclass, ropts);
/* Decode the sequence recursively */
- ret = silc_asn1_decoder(asn1, stack1, rtype, rtag, rclass,
- ropts, src, depth + 1, FALSE);
+ ret = silc_asn1_decoder(asn1, SILC_ASN1_STACK(stack1, asn1),
+ rtype, rtag, rclass, ropts, src,
+ depth + 1, FALSE);
if (!ret)
goto fail;
break;
goto fail;
}
- silc_mp_sinit(asn1->stack1, *intval);
+ silc_mp_sinit(SILC_ASN1_STACK(stack1, asn1), *intval);
/* Check whether the integer is positive or negative */
if (rdata[0] & 0x80) {
/* 2s complement and change sign */
silc_mp_init(&z);
- silc_mp_set(&z, 0);
+ silc_mp_set_ui(&z, 0);
silc_mp_add_ui(*intval, *intval, 1);
silc_mp_sub(*intval, &z, *intval);
silc_mp_uninit(&z);
break;
}
+ case SILC_ASN1_TAG_SHORT_INTEGER:
+ {
+ /* Short Integer */
+ SilcMPInt z;
+ SILC_ASN1_VAD(asn1, opts, SilcUInt32, intval);
+
+ if (rdata_len < 1) {
+ SILC_LOG_DEBUG(("Malformed integer value"));
+ SILC_ASN1_VA_FREE(opts, intval);
+ ret = FALSE;
+ goto fail;
+ }
+
+ silc_stack_push(SILC_ASN1_STACK(stack1, asn1), NULL);
+ silc_mp_sinit(SILC_ASN1_STACK(stack1, asn1), &z);
+ silc_mp_bin2mp((unsigned char *)rdata, rdata_len, &z);
+ *(*intval) = silc_mp_get_ui(&z);
+ silc_mp_uninit(&z);
+ silc_stack_pop(SILC_ASN1_STACK(stack1, asn1));
+ break;
+ }
+
case SILC_ASN1_TAG_OID:
{
/* Object identifier */
if (rdata_len < 1) {
SILC_LOG_DEBUG(("Malformed object identifier value"));
+ SILC_ASN1_VA_FREE(opts, oidstr);
ret = FALSE;
goto fail;
}
/* Set two OID values */
memset(&tmpb, 0, sizeof(tmpb));
memset(tmpstr, 0, sizeof(tmpstr));
- snprintf(tmpstr, sizeof(tmpstr) - 1, "%lu.%lu",
+ silc_snprintf(tmpstr, sizeof(tmpstr) - 1, "%lu.%lu",
(unsigned long)(rdata[0] & 0xff) / 40,
(unsigned long)(rdata[0] & 0xff) % 40);
- silc_buffer_sstrformat(asn1->stack1, &tmpb, tmpstr, SILC_STR_END);
+ silc_buffer_sstrformat(SILC_ASN1_STACK(stack1, asn1),
+ &tmpb, tmpstr, SILC_STR_END);
/* Set rest of the OID values, each octet having 7 bits of the
OID value with bit 8 set. An octet not having bit 8 set
oid |= rdata[i];
memset(tmpstr, 0, sizeof(tmpstr));
- snprintf(tmpstr, sizeof(tmpstr) - 1, ".%lu", (unsigned long)oid);
- silc_buffer_sstrformat(asn1->stack1, &tmpb, tmpstr, SILC_STR_END);
+ silc_snprintf(tmpstr, sizeof(tmpstr) - 1, ".%lu",
+ (unsigned long)oid);
+ silc_buffer_sstrformat(SILC_ASN1_STACK(stack1, asn1),
+ &tmpb, tmpstr, SILC_STR_END);
}
*oidstr = tmpb.head;
if (rdata_len < 2) {
SILC_LOG_DEBUG(("Malformed bit string value"));
+ SILC_ASN1_VA_FREE(opts, d);
ret = FALSE;
goto fail;
}
- *d = silc_smemdup(stack1, rdata + 1, rdata_len - 1);
+ *d = silc_smemdup(SILC_ASN1_STACK(stack1, asn1),
+ rdata + 1, rdata_len - 1);
*d_len = (rdata_len - 1) * 8;
break;
}
case SILC_ASN1_TAG_NULL:
{
+ SILC_ASN1_VAD(asn1, opts, SilcBool, val);
+
/* Decode empty BER block */
if (rdata_len != 0) {
SILC_LOG_DEBUG(("Malformed null value"));
goto fail;
}
+
+ *(*val) = TRUE;
break;
}
if (rdata_len < 1) {
SILC_LOG_DEBUG(("Malformed UTC time value"));
+ SILC_ASN1_VA_FREE(opts, t);
ret = FALSE;
goto fail;
}
if (rdata_len < 1) {
SILC_LOG_DEBUG(("Malformed generalized time value"));
+ SILC_ASN1_VA_FREE(opts, t);
ret = FALSE;
goto fail;
}
/* Parse the time string */
if (!silc_time_generalized(rdata, *t)) {
SILC_LOG_DEBUG(("Malformed generalized time value"));
+ SILC_ASN1_VA_FREE(opts, t);
ret = FALSE;
goto fail;
}
if (!silc_utf8_valid(rdata, rdata_len)) {
SILC_LOG_DEBUG(("Malformed UTF-8 string value"));
+ SILC_ASN1_VA_FREE(opts, s);
ret = FALSE;
goto fail;
}
- *s = silc_smemdup(stack1, rdata, rdata_len);
+ *s = silc_smemdup(SILC_ASN1_STACK(stack1, asn1), rdata, rdata_len);
*s_len = rdata_len;
break;
}
case SILC_ASN1_TAG_OCTET_STRING:
{
- /* Octet string. We take it as 8-bit ASCII */
+ /* Octet string. Take data as is. */
SILC_ASN1_VAD_UCHAR(asn1, opts, unsigned char, s, s_len);
- SILC_ASN1_DECODE_STRING(SILC_STRING_ASCII, s, s_len);
+ *s = silc_smemdup(SILC_ASN1_STACK(stack1, asn1), rdata, rdata_len);
+ *s_len = rdata_len;
break;
}
if (!found) {
/* No choices were found, error */
SILC_LOG_DEBUG(("Invalid ASN.1 choice: no choices present"));
+ *choice_index = 0;
ret = FALSE;
goto fail;
}
+ if (!choice_found) {
+ (*choice_index)++;
+ SILC_LOG_DEBUG(("Found choice %s type, index %d",
+ silc_asn1_tag_name(rtype), *choice_index));
+ }
+
/* Take next type and new BER object, choices are over */
choice = FALSE;
SILC_ASN1_ARGS(asn1, type, tag, ber_class, opts);
}
if (choice) {
+ if (!choice_found)
+ (*choice_index)++;
+
/* Even if the choice was found we must go through rest of
the choices. */
if (found && len) {
- SILC_LOG_DEBUG(("Found choice %s type", silc_asn1_tag_name(rtype)));
+ choice_found = TRUE;
+ SILC_LOG_DEBUG(("Found choice %s type, index %d",
+ silc_asn1_tag_name(rtype), *choice_index));
rdata_len = len = 0;
}
opts |= SILC_ASN1_OPTIONAL;
SilcAsn1Options opts;
SilcBerClass ber_class;
SilcStackFrame frame1, frame2;
- SilcStack stack1 = NULL, stack2 = NULL;
+ SilcStack stack1 = NULL, stack2 = NULL, orig;
SilcBool ret;
if (!asn1)
va_start(asn1->ap, src);
+ orig = asn1->orig_stack;
+
/* Get the first arguments and call the decoder. */
SILC_ASN1_ARGS(asn1, type, tag, ber_class, opts);
if (!type) {
va_end(asn1->ap);
- asn1->ap = NULL;
return FALSE;
}
stack2 = asn1->stack2;
asn1->stack1 = NULL;
asn1->stack2 = NULL;
+ asn1->orig_stack = orig;
}
if (o & SILC_ASN1_ACCUMUL) {
stack1 = asn1->stack1;
asn1->stack1 = asn1->stack2;
asn1->stack2 = stack1;
+ asn1->switched = !asn1->switched;
}
}
asn1->stack2 = stack2;
}
+ asn1->orig_stack = orig;
+
va_end(asn1->ap);
- asn1->ap = NULL;
return ret;
}
projects / silc.git / blobdiff