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

[crypto.git] / lib / silcasn1 / silcasn1.c

diff --git a/lib/silcasn1/silcasn1.c b/lib/silcasn1/silcasn1.c
index eec926c49ec4fd1b2d789dc9f9b0b141f19fc945..007f1990d98fe6baa1680772d5850ba1c11d6e72 100644 (file)
--- a/lib/silcasn1/silcasn1.c
+++ b/lib/silcasn1/silcasn1.c
@@ -17,7 +17,7 @@
 
 */
 
-#include "silcincludes.h"
+#include "silc.h"
 #include "silcasn1.h"
 #include "silcber.h"
 
@@ -45,7 +45,7 @@ void silc_asn1_free(SilcAsn1 asn1)
 
 /* Init pre-allocated ASN.1 context */
 
-bool silc_asn1_init(SilcAsn1 asn1)
+SilcBool silc_asn1_init(SilcAsn1 asn1)
 {
   asn1->stack1 = silc_stack_alloc(768);
   if (!asn1->stack1)
@@ -66,10 +66,6 @@ bool silc_asn1_init(SilcAsn1 asn1)
 
 void silc_asn1_uninit(SilcAsn1 asn1)
 {
-#if 1
-  silc_stack_stats(asn1->stack1);
-  silc_stack_stats(asn1->stack2);
-#endif
   silc_stack_free(asn1->stack1);
   silc_stack_free(asn1->stack2);
 }
@@ -88,9 +84,10 @@ const char *silc_asn1_tag_name(SilcAsn1Tag tag)
     return "choice";
   case SILC_ASN1_TAG_ANY:
     return "any";
+  case SILC_ASN1_TAG_ANY_PRIMITIVE:
+    return "any primitive";
   case SILC_ASN1_TAG_SEQUENCE_OF:
     return "sequence of";
-
   case SILC_ASN1_TAG_SEQUENCE:
     return "sequence";
   case SILC_ASN1_TAG_SET:
@@ -155,14 +152,14 @@ const char *silc_asn1_tag_name(SilcAsn1Tag tag)
 
 /* Dumps the ASN.1 data block into standard output (stdout). */
 
-bool silc_asn1_dump(SilcAsn1 asn1, SilcBuffer src)
+SilcBool silc_asn1_dump(SilcAsn1 asn1, SilcBuffer src)
 {
-  bool ret = FALSE;
+  SilcBool ret = FALSE;
   SilcBerEncoding renc;
   SilcAsn1Tag rtag;
   const unsigned char *rdata;
   SilcUInt32 rdata_len, len = 0;
-  bool rindef;
+  SilcBool rindef;
 
   SILC_LOG_DEBUG(("Dumping ASN.1"));