Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2003 - 2006 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
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;
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"));
ret = FALSE; \
goto fail; \
} \
- *s = silc_smalloc_ua(stack1, *s_len + 1); \
+ *s = silc_smalloc(stack1, *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;
const unsigned char *rdata;
SilcUInt32 rdata_len;
/* 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"));
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(stack1, rdata, rdata_len);
+ *s_len = rdata_len;
break;
}