X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcasn1%2Fsilcasn1_encode.c;h=986909c4d7348cdd43e4146dc9cb9f217510e381;hp=a0504f55a8ca000e5b6642e899661561f6cc879c;hb=ebfe5dc8641467efea3506a4797a2b1260b2da55;hpb=0f0340b9fbce9704cc7171f8f0104ce9103d2de6 diff --git a/lib/silcasn1/silcasn1_encode.c b/lib/silcasn1/silcasn1_encode.c index a0504f55..986909c4 100644 --- a/lib/silcasn1/silcasn1_encode.c +++ b/lib/silcasn1/silcasn1_encode.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - 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 @@ -17,10 +17,12 @@ */ -#include "silcincludes.h" +#include "silc.h" #include "silcasn1.h" #include "silcber.h" +#define SILC_ASN1_BUFFER_FREE(b, stack) if (!stack) silc_buffer_purge(b); + /************************** ASN.1 Encoder routines **************************/ /* Encode string from UTF-8 string to other string encodings. Encodes @@ -36,7 +38,7 @@ goto fail; \ } \ silc_stack_push(asn1->stack2, &frame); \ - s = silc_smalloc_ua(stack2, s_len + 1); \ + s = silc_smalloc(stack2, s_len + 1); \ if (s) { \ silc_utf8_decode(d, d_len, (enc), s, s_len); \ s[s_len] = '\0'; \ @@ -56,18 +58,18 @@ is TRUE if this encoder receives one primitive type as argument. If it is a constructed type it must be FALSE value. */ -static bool +static SilcBool silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, SilcAsn1Tag type, SilcAsn1Tag tag, SilcBerClass ber_class, SilcAsn1Options opts, SilcBuffer dest, SilcUInt32 depth, - bool primitive) + SilcBool primitive) { unsigned char *ptr = dest->data; SilcAsn1Tag rtype, rtag; SilcAsn1Options ropts; SilcBerClass rclass; SilcUInt32 len = 0; - bool ret = FALSE, indef; + SilcBool ret = FALSE, indef; SilcBufferStruct buf; SilcStackFrame frame; @@ -91,12 +93,19 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, 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; + } } #ifdef SILC_DEBUG @@ -129,10 +138,10 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, ret = silc_asn1_encoder(asn1, stack2, stack1, type, type, SILC_BER_CLASS_UNIVERSAL, opts, &buf, depth + 1, primitive); - silc_stack_pop(stack2); if (!ret) { SILC_LOG_DEBUG(("Error encoding explicit tag")); + silc_stack_pop(stack2); goto fail; } @@ -142,6 +151,8 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, silc_buffer_truelen(dest) + len); ret = silc_ber_encode(dest, ber_class, SILC_BER_ENC_CONSTRUCTED, tag, buf.data, silc_buffer_len(&buf), FALSE); + SILC_ASN1_BUFFER_FREE(&buf, stack2); + silc_stack_pop(stack2); if (!ret) goto fail; if (primitive) { @@ -192,11 +203,31 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, len = silc_buffer_len(node); dest = silc_buffer_srealloc_size(stack1, dest, silc_buffer_truelen(dest) + len); + if (!dest) + goto fail; silc_buffer_put(dest, node->data, len); } break; } + case SILC_ASN1_TAG_ANY_PRIMITIVE: + { + /* ANY_PRIMITIVE is any primitive in encoded format. */ + SilcBuffer prim = va_arg(asn1->ap, SilcBuffer); + if (!prim) + break; + + /* Encode the primitive data */ + len = silc_ber_encoded_len(tag, silc_buffer_len(prim), FALSE); + dest = silc_buffer_srealloc_size(stack1, dest, + silc_buffer_truelen(dest) + len); + ret = silc_ber_encode(dest, ber_class, SILC_BER_ENC_PRIMITIVE, + tag, prim->data, silc_buffer_len(prim), FALSE); + if (!ret) + goto fail; + break; + } + case SILC_ASN1_TAG_SEQUENCE: case SILC_ASN1_TAG_SET: { @@ -210,9 +241,9 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, silc_stack_push(stack2, &frame); ret = silc_asn1_encoder(asn1, stack2, stack1, rtype, rtag, rclass, ropts, &buf, depth + 1, FALSE); - silc_stack_pop(stack2); if (!ret) { SILC_LOG_DEBUG(("Error traversing a SEQUENCE/SET")); + silc_stack_pop(stack2); goto fail; } @@ -222,6 +253,8 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, silc_buffer_truelen(dest) + len); ret = silc_ber_encode(dest, ber_class, SILC_BER_ENC_CONSTRUCTED, tag, buf.data, silc_buffer_len(&buf), indef); + SILC_ASN1_BUFFER_FREE(&buf, stack2); + silc_stack_pop(stack2); if (!ret) goto fail; break; @@ -241,11 +274,15 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, bytes in 1s complement */ } else { /* Positive */ - len = (silc_mp_sizeinbase(mpint, 2) + 7) / 8; - len += len & 7 ? 1: 0; + len = silc_mp_sizeinbase(mpint, 2); + if (!(len & 7)) + len = ((len + 7) / 8) + 1; + else + len = (len + 7) / 8; silc_stack_push(stack2, &frame); silc_buffer_srealloc_size(stack2, &buf, silc_buffer_truelen(&buf) + len); + buf.data[0] = 0x00; silc_mp_mp2bin_noalloc(mpint, buf.data, silc_buffer_len(&buf)); } @@ -255,26 +292,66 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, silc_buffer_truelen(dest) + len); ret = silc_ber_encode(dest, ber_class, SILC_BER_ENC_PRIMITIVE, tag, buf.data, silc_buffer_len(&buf), FALSE); + SILC_ASN1_BUFFER_FREE(&buf, stack2); silc_stack_pop(stack2); if (!ret) goto fail; break; } + case SILC_ASN1_TAG_SHORT_INTEGER: + { + /* Short Integer */ + SilcUInt32 sint = va_arg(asn1->ap, SilcUInt32); + SilcMPInt z; + + if (tag == SILC_ASN1_TAG_SHORT_INTEGER) + tag = SILC_ASN1_TAG_INTEGER; + + memset(&buf, 0, sizeof(buf)); + + silc_stack_push(stack2, &frame); + silc_mp_sinit(stack2, &z); + silc_mp_set_ui(&z, sint); + + len = silc_mp_sizeinbase(&z, 2); + if (!(len & 7)) + len = ((len + 7) / 8) + 1; + else + len = (len + 7) / 8; + silc_buffer_srealloc_size(stack2, &buf, + silc_buffer_truelen(&buf) + len); + buf.data[0] = 0x00; + silc_mp_mp2bin_noalloc(&z, buf.data, silc_buffer_len(&buf)); + silc_mp_uninit(&z); + + /* Encode the integer */ + len = silc_ber_encoded_len(tag, len, indef); + dest = silc_buffer_srealloc_size(stack1, dest, + silc_buffer_truelen(dest) + len); + ret = silc_ber_encode(dest, ber_class, SILC_BER_ENC_PRIMITIVE, + tag, buf.data, silc_buffer_len(&buf), FALSE); + SILC_ASN1_BUFFER_FREE(&buf, stack2); + silc_stack_pop(stack2); + if (!ret) + goto fail; + break; + } + break; + case SILC_ASN1_TAG_OID: { /* Object identifier */ char *cp, *oidstr = va_arg(asn1->ap, char *); SilcUInt32 words[24], oid, mask; - int i, c = -1; + int i, k, c = 0; if (!oidstr) break; /* Get OID words from the string */ cp = strchr(oidstr, '.'); while (cp) { - c = sscanf(oidstr, "%lu", (unsigned long *)&oid); - if (c < 1) { + if (sscanf(oidstr, "%u", &oid) != 1) { SILC_LOG_DEBUG(("Malformed OID string")); goto fail; } @@ -283,6 +360,17 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, words[c++] = oid; oidstr = cp + 1; cp = strchr(oidstr, '.'); + + if (!cp) { + if (sscanf(oidstr, "%u", &oid) != 1) { + SILC_LOG_DEBUG(("Malformed OID string")); + goto fail; + } + if (c + 1 > sizeof(words) / sizeof(words[0])) + goto fail; + words[c++] = oid; + break; + } } if (c < 2) { SILC_LOG_DEBUG(("Malfromed OID string")); @@ -308,7 +396,7 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, for (i = 2, len = 1; i < c; i++) { oid = words[i]; if (oid) { - c = len; + k = len; mask = 0; while (oid) { buf.data[len++] = (oid & 0x7f) | mask; @@ -316,11 +404,11 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, mask |= 0x80; } mask = len - 1; - while (c < mask) { - oid = buf.data[c]; - buf.data[c] = buf.data[mask]; + while (k < mask) { + oid = buf.data[k]; + buf.data[k] = buf.data[mask]; buf.data[mask] = oid; - c++; + k++; mask--; } @@ -329,11 +417,12 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, buf.data[len++] = 0x00; } - len = silc_ber_encoded_len(tag, len, indef); + len = silc_ber_encoded_len(tag, silc_buffer_len(&buf), indef); dest = silc_buffer_srealloc_size(stack1, dest, silc_buffer_truelen(dest) + len); ret = silc_ber_encode(dest, ber_class, SILC_BER_ENC_PRIMITIVE, tag, buf.data, silc_buffer_len(&buf), FALSE); + SILC_ASN1_BUFFER_FREE(&buf, stack2); silc_stack_pop(stack2); if (!ret) goto fail; @@ -383,6 +472,7 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, silc_buffer_truelen(dest) + len); ret = silc_ber_encode(dest, ber_class, SILC_BER_ENC_PRIMITIVE, tag, buf.data, silc_buffer_len(&buf), indef); + SILC_ASN1_BUFFER_FREE(&buf, stack2); silc_stack_pop(stack2); if (!ret) goto fail; @@ -475,8 +565,17 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, case SILC_ASN1_TAG_OCTET_STRING: { - /* Octet string. We put it in as 8-bit ASCII */ - SILC_ASN1_ENCODE_STRING(SILC_STRING_ASCII); + /* Octet string. Put data as is. */ + unsigned char *d = va_arg(asn1->ap, unsigned char *); + SilcUInt32 d_len = va_arg(asn1->ap, SilcUInt32); + + len = silc_ber_encoded_len(tag, d_len, indef); + dest = silc_buffer_srealloc_size(stack1, dest, + silc_buffer_truelen(dest) + len); + ret = silc_ber_encode(dest, ber_class, SILC_BER_ENC_PRIMITIVE, + tag, d, d_len, indef); + if (!ret) + goto fail; break; } @@ -588,14 +687,14 @@ silc_asn1_encoder(SilcAsn1 asn1, SilcStack stack1, SilcStack stack2, return ret; } -bool silc_asn1_encode(SilcAsn1 asn1, SilcBuffer dest, ...) +SilcBool silc_asn1_encode(SilcAsn1 asn1, SilcBuffer dest, ...) { SilcAsn1Tag type, tag; SilcAsn1Options opts; SilcBerClass ber_class; SilcStackFrame frame1, frame2; SilcStack stack1 = NULL; - bool ret; + SilcBool ret; if (!asn1) return FALSE; @@ -606,7 +705,6 @@ bool silc_asn1_encode(SilcAsn1 asn1, SilcBuffer dest, ...) SILC_ASN1_ARGS(asn1, type, tag, ber_class, opts); if (!type) { va_end(asn1->ap); - asn1->ap = NULL; return FALSE; } @@ -661,7 +759,6 @@ bool silc_asn1_encode(SilcAsn1 asn1, SilcBuffer dest, ...) asn1->stack1 = stack1; va_end(asn1->ap); - asn1->ap = NULL; return ret; }