From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 21 Nov 2012 22:27:29 +0000 (+0100)
Subject: updated libtasn1 version
X-Git-Tag: gnutls_3_1_5~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=230055df010c42deea57e282793ce5aab7cf1113;p=thirdparty%2Fgnutls.git

updated libtasn1 version
---

diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h
index 5be46d073c..c80a5ca457 100644
--- a/lib/minitasn1/libtasn1.h
+++ b/lib/minitasn1/libtasn1.h
@@ -124,7 +124,7 @@ extern "C"
     unsigned int type;		/* Node type */
     const void *value;		/* Node value */
   };
-  typedef struct asn1_static_node_st asn1_static_node_t;
+  typedef struct asn1_static_node_st asn1_static_node;
 
 /* List of constants for field type of typedef node_asn  */
 #define ASN1_ETYPE_CONSTANT       1
@@ -183,7 +183,7 @@ extern "C"
 		       const char *vectorName, char *errorDescription);
 
   extern ASN1_API int
-    asn1_array2tree (const asn1_static_node_t * array,
+    asn1_array2tree (const asn1_static_node * array,
 		     asn1_node * definitions, char *errorDescription);
 
   extern ASN1_API void
@@ -307,7 +307,8 @@ typedef int asn1_retCode;	/* type returned by libtasn1 functions */
 #define ASN1_TYPE_EMPTY NULL
 
 #define static_struct_asn asn1_static_node_st
-#define ASN1_ARRAY_TYPE asn1_static_node_t
+#define ASN1_ARRAY_TYPE asn1_static_node
+#define asn1_static_node_t asn1_static_node
 
 #define node_data_struct asn1_data_node_st
 #define ASN1_DATA_NODE asn1_data_node_st
diff --git a/lib/minitasn1/structure.c b/lib/minitasn1/structure.c
index 4613d06066..32be50b7c3 100644
--- a/lib/minitasn1/structure.c
+++ b/lib/minitasn1/structure.c
@@ -96,7 +96,7 @@ _asn1_create_static_structure (asn1_node pointer, char *output_file_name,
 
   fprintf (file, "#include <libtasn1.h>\n\n");
 
-  fprintf (file, "const asn1_static_node_t %s[] = {\n", vector_name);
+  fprintf (file, "const asn1_static_node %s[] = {\n", vector_name);
 
   p = pointer;
 
@@ -174,7 +174,7 @@ _asn1_create_static_structure (asn1_node pointer, char *output_file_name,
  *   %ASN1_ARRAY_ERROR if the array pointed by @array is wrong.
  **/
 int
-asn1_array2tree (const asn1_static_node_t * array, asn1_node * definitions,
+asn1_array2tree (const asn1_static_node * array, asn1_node * definitions,
 		 char *errorDescription)
 {
   asn1_node p, p_last = NULL;