New SILC PKCS API, enabling support for other public keys/certs.

[silc.git] / lib / silcasn1 / silcasn1_decode.c

diff --git a/lib/silcasn1/silcasn1_decode.c b/lib/silcasn1/silcasn1_decode.c
index ed04a0ab2e51531e894ea99992cacb899b30eb0b..8fdfef24720343da660036fcb69806fb2d3f6e01 100644 (file)
--- a/lib/silcasn1/silcasn1_decode.c
+++ b/lib/silcasn1/silcasn1_decode.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2003 - 2005 Pekka Riikonen
+  Copyright (C) 2003 - 2006 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,11 +17,10 @@
 
 */
 
-#include "silcincludes.h"
+#include "silc.h"
 #include "silcasn1.h"
 #include "silcber.h"
 
-
 /************************** ASN.1 Decoder routines **************************/
 
 /* Internal SEQUENCE OF and SET OF decoder.  This is used only when decoding
@@ -29,9 +28,9 @@
    silc_asn1_decoder function.  This parses the sequence of types and returns
    them as raw BER buffers in an array of SilcBuffers. */
 
-static bool silc_asn1_decoder_sof(SilcAsn1 asn1, SilcBuffer src)
+static SilcBool silc_asn1_decoder_sof(SilcAsn1 asn1, SilcBuffer src)
 {
-  bool ret = FALSE;
+  SilcBool ret = FALSE;
   SilcList types;
   SilcAsn1Tag type;
   SilcBuffer *retb;
@@ -39,7 +38,7 @@ static bool silc_asn1_decoder_sof(SilcAsn1 asn1, SilcBuffer src)
   SilcAsn1Tag rtag;
   const unsigned char *rdata;
   SilcUInt32 rdata_len, len = 0;
-  bool found = FALSE, rindef;
+  SilcBool found = FALSE, rindef;
 
   struct SilcAsn1SofStruct {
     SilcAsn1Tag type;
@@ -243,11 +242,11 @@ static bool silc_asn1_decoder_sof(SilcAsn1 asn1, SilcBuffer src)
    arguments (either very first or first for recursion) for a type.
    The `depth' includes the current depth of recursion. */
 
-static bool
+static SilcBool
 silc_asn1_decoder(SilcAsn1 asn1, SilcStack stack1, SilcAsn1Tag type,
                  SilcAsn1Tag tag, SilcBerClass ber_class,
                  SilcAsn1Options opts, SilcBuffer src, SilcUInt32 depth,
-                 bool primitive)
+                 SilcBool primitive)
 {
   unsigned char *ptr = src->data;
   SilcAsn1Tag rtype, rtag;
@@ -255,7 +254,7 @@ silc_asn1_decoder(SilcAsn1 asn1, SilcStack stack1, SilcAsn1Tag type,
   SilcBerClass rclass;
   SilcBerEncoding renc;
   SilcUInt32 len = 0;
-  bool ret, indef, rindef, found = FALSE, choice = FALSE;
+  SilcBool ret, indef, rindef, found = FALSE, choice = FALSE;
   const unsigned char *rdata;
   SilcUInt32 rdata_len;
   int i;
@@ -296,12 +295,19 @@ silc_asn1_decoder(SilcAsn1 asn1, SilcStack stack1, SilcAsn1Tag type,
     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;
+      }
     }
 
     /* Now decode a BER encoded block from the source buffer.  It must be
@@ -411,6 +417,16 @@ silc_asn1_decoder(SilcAsn1 asn1, SilcStack stack1, SilcAsn1Tag type,
          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(stack1, *prim, rdata_len);
+         silc_buffer_put(*prim, rdata, rdata_len);
+         break;
+       }
+
       case SILC_ASN1_TAG_SEQUENCE:
       case SILC_ASN1_TAG_SET:
        {
@@ -455,7 +471,7 @@ silc_asn1_decoder(SilcAsn1 asn1, SilcStack stack1, SilcAsn1Tag type,
 
            /* 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);
@@ -517,7 +533,7 @@ silc_asn1_decoder(SilcAsn1 asn1, SilcStack stack1, SilcAsn1Tag type,
       case SILC_ASN1_TAG_BOOLEAN:
        {
          /* Decode boolean (TRUE/FALSE) value */
-         SILC_ASN1_VAD(asn1, opts, bool, val);
+         SILC_ASN1_VAD(asn1, opts, SilcBool, val);
 
          if (rdata_len != 1) {
            SILC_LOG_DEBUG(("Malformed boolean value"));
@@ -778,14 +794,14 @@ silc_asn1_decoder(SilcAsn1 asn1, SilcStack stack1, SilcAsn1Tag type,
   return ret;
 }
 
-bool silc_asn1_decode(SilcAsn1 asn1, SilcBuffer src, ...)
+SilcBool silc_asn1_decode(SilcAsn1 asn1, SilcBuffer src, ...)
 {
   SilcAsn1Tag type, tag;
   SilcAsn1Options opts;
   SilcBerClass ber_class;
   SilcStackFrame frame1, frame2;
   SilcStack stack1 = NULL, stack2 = NULL;
-  bool ret;
+  SilcBool ret;
 
   if (!asn1)
     return FALSE;