From MAILER-DAEMON Mon Oct 01 16:15:09 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TImOT-0001r0-8k
	for mharc-libtasn1-commit@gnu.org; Mon, 01 Oct 2012 16:15:09 -0400
Received: from eggs.gnu.org ([208.118.235.92]:59288)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TImOK-0001hW-OI
	for libtasn1-commit@gnu.org; Mon, 01 Oct 2012 16:15:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TImOB-0003Ak-Gf
	for libtasn1-commit@gnu.org; Mon, 01 Oct 2012 16:15:00 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:52169)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TImOB-0003Ag-Ay
	for libtasn1-commit@gnu.org; Mon, 01 Oct 2012 16:14:51 -0400
Received: from nmav by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TImOA-0005xa-EK
	for libtasn1-commit@gnu.org; Mon, 01 Oct 2012 20:14:50 +0000
Date: Mon, 01 Oct 2012 20:14:50 +0000
Message-Id: <E1TImOA-0005xa-EK@vcs.savannah.gnu.org>
From: "Nikos Mavrogiannopoulos" <nmav@gnutls.org>
To: libtasn1-commit@gnu.org
Subject: [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_13-40-g841a245
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 005827d4b7c32d43cfbd1235ba1dd4d0a4ea7fcc
X-Git-Newrev: 841a2450a9d4497c84b248f8faec1e3e38cd195b
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libtasn1-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libtasn1 <libtasn1-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtasn1-commit>
List-Post: <mailto:libtasn1-commit@gnu.org>
List-Help: <mailto:libtasn1-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2012 20:15:06 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=841a2450a9d4497c84b248f8faec1e3e38cd195b

The branch, master has been updated
       via  841a2450a9d4497c84b248f8faec1e3e38cd195b (commit)
       via  c48c4111d0429a5c3c1ccc19745a7ce6359efe30 (commit)
       via  0f25d868fa70dd4a4f373158a8ce692806161981 (commit)
       via  6b4c44923d89de87d9b908b10eecc19f598f51c3 (commit)
       via  3745b54eee7934478aa0fcb7ceecb4797fd78115 (commit)
       via  97f40453042a02371269f2d7af6f46928276ece8 (commit)
       via  901a49ced275c448e21177b64f6fe85f1d4208b2 (commit)
      from  005827d4b7c32d43cfbd1235ba1dd4d0a4ea7fcc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 841a2450a9d4497c84b248f8faec1e3e38cd195b
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Mon Oct 1 22:13:55 2012 +0200

    documented update

commit c48c4111d0429a5c3c1ccc19745a7ce6359efe30
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Mon Oct 1 22:09:26 2012 +0200

    ASN1_TYPE definition corrected

commit 0f25d868fa70dd4a4f373158a8ce692806161981
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Mon Oct 1 22:07:34 2012 +0200

    updated to new types

commit 6b4c44923d89de87d9b908b10eecc19f598f51c3
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Mon Oct 1 22:03:03 2012 +0200

    node_data_struct -> asn_data_node_st

commit 3745b54eee7934478aa0fcb7ceecb4797fd78115
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Mon Oct 1 22:00:02 2012 +0200

    ASN1_ARRAY_TYPE -> asn_static_node_t

commit 97f40453042a02371269f2d7af6f46928276ece8
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Mon Oct 1 21:55:54 2012 +0200

    Renamed types.
    
    node_asn -> asn_node_st
    ASN1_TYPE -> node_asn_t
    ASN1_TYPE_EMPTY -> NULL

commit 901a49ced275c448e21177b64f6fe85f1d4208b2
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Mon Oct 1 21:48:04 2012 +0200

    asn1_retCode -> int

-----------------------------------------------------------------------

Summary of changes:
 NEWS               |    9 ++++
 doc/libtasn1.texi  |    8 ++--
 lib/ASN1.c         |   18 ++++----
 lib/coding.c       |   34 +++++++-------
 lib/decoding.c     |   86 ++++++++++++++++++------------------
 lib/element.c      |   34 +++++++-------
 lib/element.h      |    6 +-
 lib/errors.c       |    4 +-
 lib/int.h          |   14 +++---
 lib/libtasn1.h     |  121 ++++++++++++++++++++++++++++-----------------------
 lib/parser_aux.c   |   86 ++++++++++++++++++------------------
 lib/parser_aux.h   |   56 ++++++++++++------------
 lib/structure.c    |  118 +++++++++++++++++++++++++-------------------------
 lib/structure.h    |    8 ++--
 src/asn1Coding.c   |    6 +-
 src/asn1Decoding.c |   10 ++--
 src/asn1Parser.c   |    2 +-
 17 files changed, 320 insertions(+), 300 deletions(-)

diff --git a/NEWS b/NEWS
index aa30c23..ad700d8 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,15 @@ GNU Libtasn1 NEWS                                     -*- outline -*-
 - Optimizations in internal tree allocation.
 - Optimizations in tree search.
 - libtasn1.h no longer exports internal structures.
+- Types were renamed for consistency:
+  ASN1_DATA_NODE -> asn_data_node_st
+  ASN1_ARRAY_TYPE -> asn_static_node_t
+  ASN1_TYPE -> asn_node_t
+  ASN1_TYPE_EMPTY -> NULL
+  static_struct_asn -> asn_static_node_st
+  node_asn_struct -> asn_node_st
+  node_asn -> asn_node_st
+  (the old types are still available as definitions)
 
 * Noteworthy changes in release 2.13 (2012-05-31) [stable]
 - Updated fix for DER decoding issue to not depend on specific compilers.
diff --git a/doc/libtasn1.texi b/doc/libtasn1.texi
index 3b97215..fc88b25 100644
--- a/doc/libtasn1.texi
+++ b/doc/libtasn1.texi
@@ -229,16 +229,16 @@ The name "?LAST" indicates the last element of a @code{SET_OF} or
 
 The header file of this library is @file{libtasn1.h}.
 
-@cindex Main type ASN1_TYPE
+@cindex Main type asn_node_t
 
-The main type used in it is @code{ASN1_TYPE}, and it's used to store
+The main type used in it is @code{asn_node_t}, and it's used to store
 the ASN.1 definitions and structures (instances).
 
-The constant @code{ASN1_TYPE_EMPTY} can be used for the variable
+The constant @code{NULL} can be used for the variable
 initialization.  For example:
 
 @example
- ASN1_TYPE definitions=ASN1_TYPE_EMPTY;
+ asn_node_t definitions=NULL;
 @end example
 
 Some functions require a parameter named errorDescription of char*
diff --git a/lib/ASN1.c b/lib/ASN1.c
index b6a5844..f61df56 100644
--- a/lib/ASN1.c
+++ b/lib/ASN1.c
@@ -109,9 +109,9 @@
 #include <structure.h>
 
 static FILE *file_asn1;			/* Pointer to file to parse */
-static asn1_retCode result_parse;	/* result of the parser
+static int result_parse;	/* result of the parser
 					   algorithm */
-static ASN1_TYPE p_tree;		/* pointer to the root of the
+static asn_node_t p_tree;		/* pointer to the root of the
 					   structure created by the
 					   parser*/
 static unsigned long lineNumber;	/* line number describing the
@@ -248,7 +248,7 @@ typedef union YYSTYPE
 
   unsigned int constant;
   char str[ASN1_MAX_NAME_SIZE+1];
-  ASN1_TYPE node;
+  asn_node_t node;
 
 
 
@@ -2802,23 +2802,23 @@ _asn1_create_errorDescription(int error,char *errorDescription)
  *
  * Returns: %ASN1_SUCCESS if the file has a correct syntax and every
  *   identifier is known, %ASN1_ELEMENT_NOT_EMPTY if @definitions not
- *   %ASN1_TYPE_EMPTY, %ASN1_FILE_NOT_FOUND if an error occured while
+ *   %NULL, %ASN1_FILE_NOT_FOUND if an error occured while
  *   opening @file_name, %ASN1_SYNTAX_ERROR if the syntax is not
  *   correct, %ASN1_IDENTIFIER_NOT_FOUND if in the file there is an
  *   identifier that is not defined, %ASN1_NAME_TOO_LONG if in the
  *   file there is an identifier whith more than %ASN1_MAX_NAME_SIZE
  *   characters.
  **/
-asn1_retCode
-asn1_parser2tree(const char *file_name, ASN1_TYPE *definitions,
+int
+asn1_parser2tree(const char *file_name, asn_node_t *definitions,
 		 char *errorDescription){
 
-  p_tree=ASN1_TYPE_EMPTY;
+  p_tree=NULL;
 
-  if(*definitions != ASN1_TYPE_EMPTY)
+  if(*definitions != NULL)
     return ASN1_ELEMENT_NOT_EMPTY;
 
-  *definitions=ASN1_TYPE_EMPTY;
+  *definitions=NULL;
 
   fileName = file_name;
 
diff --git a/lib/coding.c b/lib/coding.c
index 11f8f48..0a0a1e6 100644
--- a/lib/coding.c
+++ b/lib/coding.c
@@ -44,7 +44,7 @@
 /* Return:                                            */
 /******************************************************/
 static void
-_asn1_error_description_value_not_found (ASN1_TYPE node,
+_asn1_error_description_value_not_found (asn_node_t node,
 					 char *ErrorDescription)
 {
 
@@ -177,7 +177,7 @@ asn1_octet_der (const unsigned char *str, int str_len,
 /*   ASN1_MEM_ERROR when DER isn't big enough         */
 /*   ASN1_SUCCESS otherwise                           */
 /******************************************************/
-static asn1_retCode
+static int
 _asn1_time_der (unsigned char *str, unsigned char *der, int *der_len)
 {
   int len_len;
@@ -249,7 +249,7 @@ _asn1_get_utctime_der(unsigned char *der,int *der_len,unsigned char *str)
 /*   ASN1_MEM_ERROR when DER isn't big enough         */
 /*   ASN1_SUCCESS otherwise                           */
 /******************************************************/
-static asn1_retCode
+static int
 _asn1_objectid_der (unsigned char *str, unsigned char *der, int *der_len)
 {
   int len_len, counter, k, first, max_len;
@@ -372,11 +372,11 @@ asn1_bit_der (const unsigned char *str, int bit_len,
 /*   ASN1_MEM_ERROR if der vector isn't big enough,   */
 /*   otherwise ASN1_SUCCESS.                          */
 /******************************************************/
-static asn1_retCode
-_asn1_complete_explicit_tag (ASN1_TYPE node, unsigned char *der,
+static int
+_asn1_complete_explicit_tag (asn_node_t node, unsigned char *der,
 			     int *counter, int *max_len)
 {
-  ASN1_TYPE p;
+  asn_node_t p;
   int is_tag_implicit, len2, len3;
   unsigned char temp[SIZEOF_UNSIGNED_INT];
 
@@ -445,11 +445,11 @@ _asn1_complete_explicit_tag (ASN1_TYPE node, unsigned char *der,
 /*   ASN1_MEM_ERROR if der vector isn't big enough,   */
 /*   otherwise ASN1_SUCCESS.                          */
 /******************************************************/
-static asn1_retCode
-_asn1_insert_tag_der (ASN1_TYPE node, unsigned char *der, int *counter,
+static int
+_asn1_insert_tag_der (asn_node_t node, unsigned char *der, int *counter,
 		      int *max_len)
 {
-  ASN1_TYPE p;
+  asn_node_t p;
   int tag_len, is_tag_implicit;
   unsigned char class, class_implicit = 0, temp[SIZEOF_UNSIGNED_INT * 3 + 1];
   unsigned long tag_implicit = 0;
@@ -607,7 +607,7 @@ _asn1_insert_tag_der (ASN1_TYPE node, unsigned char *der, int *counter,
 /* Return:                                            */
 /******************************************************/
 static void
-_asn1_ordering_set (unsigned char *der, int der_len, ASN1_TYPE node)
+_asn1_ordering_set (unsigned char *der, int der_len, asn_node_t node)
 {
   struct vet
   {
@@ -618,7 +618,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, ASN1_TYPE node)
 
   int counter, len, len2;
   struct vet *first, *last, *p_vet, *p2_vet;
-  ASN1_TYPE p;
+  asn_node_t p;
   unsigned char class, *temp;
   unsigned long tag;
 
@@ -721,7 +721,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, ASN1_TYPE node)
 /* Return:                                            */
 /******************************************************/
 static void
-_asn1_ordering_set_of (unsigned char *der, int der_len, ASN1_TYPE node)
+_asn1_ordering_set_of (unsigned char *der, int der_len, asn_node_t node)
 {
   struct vet
   {
@@ -731,7 +731,7 @@ _asn1_ordering_set_of (unsigned char *der, int der_len, ASN1_TYPE node)
 
   int counter, len, len2, change;
   struct vet *first, *last, *p_vet, *p2_vet;
-  ASN1_TYPE p;
+  asn_node_t p;
   unsigned char *temp, class;
   unsigned long k, max;
 
@@ -866,14 +866,14 @@ _asn1_ordering_set_of (unsigned char *der, int der_len, ASN1_TYPE node)
  *   vector isn't big enough and in this case @len will contain the
  *   length needed.
  **/
-asn1_retCode
-asn1_der_coding (ASN1_TYPE element, const char *name, void *ider, int *len,
+int
+asn1_der_coding (asn_node_t element, const char *name, void *ider, int *len,
 		 char *ErrorDescription)
 {
-  ASN1_TYPE node, p, p2;
+  asn_node_t node, p, p2;
   unsigned char temp[SIZEOF_UNSIGNED_LONG_INT * 3 + 1];
   int counter, counter_old, len2, len3, tlen, move, max_len, max_len_old;
-  asn1_retCode err;
+  int err;
   unsigned char *der = ider;
 
   node = asn1_find_node (element, name);
diff --git a/lib/decoding.c b/lib/decoding.c
index 717112b..df86f85 100644
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -32,11 +32,11 @@
 #include "element.h"
 #include <limits.h>
 
-static asn1_retCode
+static int
 _asn1_get_indefinite_length_string (const unsigned char *der, int *len);
 
 static void
-_asn1_error_description_tag_error (ASN1_TYPE node, char *ErrorDescription)
+_asn1_error_description_tag_error (asn_node_t node, char *ErrorDescription)
 {
 
   Estrcpy (ErrorDescription, ":: tag error near element '");
@@ -369,10 +369,10 @@ asn1_get_bit_der (const unsigned char *der, int der_len,
 }
 
 static int
-_asn1_extract_tag_der (ASN1_TYPE node, const unsigned char *der, int der_len,
+_asn1_extract_tag_der (asn_node_t node, const unsigned char *der, int der_len,
 		       int *ret_len)
 {
-  ASN1_TYPE p;
+  asn_node_t p;
   int counter, len2, len3, is_tag_implicit;
   unsigned long tag, tag_implicit = 0;
   unsigned char class, class2, class_implicit = 0;
@@ -567,9 +567,9 @@ _asn1_extract_tag_der (ASN1_TYPE node, const unsigned char *der, int der_len,
 }
 
 static int
-_asn1_delete_not_used (ASN1_TYPE node)
+_asn1_delete_not_used (asn_node_t node)
 {
-  ASN1_TYPE p, p2;
+  asn_node_t p, p2;
 
   if (node == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
@@ -625,8 +625,8 @@ _asn1_delete_not_used (ASN1_TYPE node)
   return ASN1_SUCCESS;
 }
 
-static asn1_retCode
-_asn1_extract_der_octet (ASN1_TYPE node, const unsigned char *der,
+static int
+_asn1_extract_der_octet (asn_node_t node, const unsigned char *der,
 			 int der_len)
 {
   int len2, len3;
@@ -670,8 +670,8 @@ _asn1_extract_der_octet (ASN1_TYPE node, const unsigned char *der,
   return ASN1_SUCCESS;
 }
 
-static asn1_retCode
-_asn1_get_octet_string (const unsigned char *der, ASN1_TYPE node, int *len)
+static int
+_asn1_get_octet_string (const unsigned char *der, asn_node_t node, int *len)
 {
   int len2, len3, counter, tot_len, indefinite;
 
@@ -750,7 +750,7 @@ _asn1_get_octet_string (const unsigned char *der, ASN1_TYPE node, int *len)
 
 }
 
-static asn1_retCode
+static int
 _asn1_get_indefinite_length_string (const unsigned char *der, int *len)
 {
   int len2, len3, counter, indefinite;
@@ -812,18 +812,18 @@ _asn1_get_indefinite_length_string (const unsigned char *der, int *len)
  * string. The structure must just be created with function
  * asn1_create_element().  If an error occurs during the decoding
  * procedure, the *@ELEMENT is deleted and set equal to
- * %ASN1_TYPE_EMPTY.
+ * %NULL.
  *
  * Returns: %ASN1_SUCCESS if DER encoding OK, %ASN1_ELEMENT_NOT_FOUND
- *   if @ELEMENT is %ASN1_TYPE_EMPTY, and %ASN1_TAG_ERROR or
+ *   if @ELEMENT is %NULL, and %ASN1_TAG_ERROR or
  *   %ASN1_DER_ERROR if the der encoding doesn't match the structure
  *   name (*@ELEMENT deleted).
  **/
-asn1_retCode
-asn1_der_decoding (ASN1_TYPE * element, const void *ider, int len,
+int
+asn1_der_decoding (asn_node_t * element, const void *ider, int len,
 		   char *errorDescription)
 {
-  ASN1_TYPE node, p, p2, p3;
+  asn_node_t node, p, p2, p3;
   char temp[128];
   int counter, len2, len3, len4, move, ris, tlen;
   unsigned char class;
@@ -833,7 +833,7 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider, int len,
 
   node = *element;
 
-  if (node == ASN1_TYPE_EMPTY)
+  if (node == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
 
   if (node->type & CONST_OPTION)
@@ -1390,18 +1390,18 @@ cleanup:
  * asn1_create_element().  The DER vector must contain the encoding
  * string of the whole @STRUCTURE.  If an error occurs during the
  * decoding procedure, the *@STRUCTURE is deleted and set equal to
- * %ASN1_TYPE_EMPTY.
+ * %NULL.
  *
  * Returns: %ASN1_SUCCESS if DER encoding OK, %ASN1_ELEMENT_NOT_FOUND
- *   if ELEMENT is %ASN1_TYPE_EMPTY or @elementName == NULL, and
+ *   if ELEMENT is %NULL or @elementName == NULL, and
  *   %ASN1_TAG_ERROR or %ASN1_DER_ERROR if the der encoding doesn't
  *   match the structure @structure (*ELEMENT deleted).
  **/
-asn1_retCode
-asn1_der_decoding_element (ASN1_TYPE * structure, const char *elementName,
+int
+asn1_der_decoding_element (asn_node_t * structure, const char *elementName,
 			   const void *ider, int len, char *errorDescription)
 {
-  ASN1_TYPE node, p, p2, p3, nodeFound = ASN1_TYPE_EMPTY;
+  asn_node_t node, p, p2, p3, nodeFound = NULL;
   char temp[128], currentName[ASN1_MAX_NAME_SIZE * 10], *dot_p, *char_p;
   int nameLen = ASN1_MAX_NAME_SIZE * 10 - 1, state;
   int counter, len2, len3, len4, move, ris, tlen;
@@ -1412,7 +1412,7 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const char *elementName,
 
   node = *structure;
 
-  if (node == ASN1_TYPE_EMPTY)
+  if (node == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
 
   if (elementName == NULL)
@@ -2207,15 +2207,15 @@ cleanup:
  * certificate.
  *
  * Returns: %ASN1_SUCCESS if DER encoding OK, %ASN1_ELEMENT_NOT_FOUND
- *   if ELEMENT is %ASN1_TYPE EMPTY or @name_element is not a valid
+ *   if ELEMENT is %asn_node_t EMPTY or @name_element is not a valid
  *   element, %ASN1_TAG_ERROR or %ASN1_DER_ERROR if the der encoding
  *   doesn't match the structure ELEMENT.
  **/
-asn1_retCode
-asn1_der_decoding_startEnd (ASN1_TYPE element, const void *ider, int len,
+int
+asn1_der_decoding_startEnd (asn_node_t element, const void *ider, int len,
 			    const char *name_element, int *start, int *end)
 {
-  ASN1_TYPE node, node_to_find, p, p2, p3;
+  asn_node_t node, node_to_find, p, p2, p3;
   int counter, len2, len3, len4, move, ris;
   unsigned char class;
   unsigned long tag;
@@ -2224,7 +2224,7 @@ asn1_der_decoding_startEnd (ASN1_TYPE element, const void *ider, int len,
 
   node = element;
 
-  if (node == ASN1_TYPE_EMPTY)
+  if (node == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
 
   node_to_find = asn1_find_node (node, name_element);
@@ -2562,17 +2562,17 @@ asn1_der_decoding_startEnd (ASN1_TYPE element, const void *ider, int len,
  *   problem in OBJECT_ID -> TYPE association, or other error codes
  *   depending on DER decoding.
  **/
-asn1_retCode
-asn1_expand_any_defined_by (ASN1_TYPE definitions, ASN1_TYPE * element)
+int
+asn1_expand_any_defined_by (asn_node_t definitions, asn_node_t * element)
 {
   char definitionsName[ASN1_MAX_NAME_SIZE], name[2 * ASN1_MAX_NAME_SIZE + 1],
     value[ASN1_MAX_NAME_SIZE];
-  asn1_retCode retCode = ASN1_SUCCESS, result;
+  int retCode = ASN1_SUCCESS, result;
   int len, len2, len3;
-  ASN1_TYPE p, p2, p3, aux = ASN1_TYPE_EMPTY;
+  asn_node_t p, p2, p3, aux = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
 
-  if ((definitions == ASN1_TYPE_EMPTY) || (*element == ASN1_TYPE_EMPTY))
+  if ((definitions == NULL) || (*element == NULL))
     return ASN1_ELEMENT_NOT_FOUND;
 
   strcpy (definitionsName, definitions->name);
@@ -2696,7 +2696,7 @@ asn1_expand_any_defined_by (ASN1_TYPE definitions, ASN1_TYPE * element)
 				      if (result == ASN1_SUCCESS)
 					{
 					  p = aux;
-					  aux = ASN1_TYPE_EMPTY;
+					  aux = NULL;
 					  break;
 					}
 				      else
@@ -2792,22 +2792,22 @@ asn1_expand_any_defined_by (ASN1_TYPE definitions, ASN1_TYPE * element)
  *   %ASN1_VALUE_NOT_VALID if it wasn't possible to find the type to
  *   use for expansion, or other errors depending on DER decoding.
  **/
-asn1_retCode
-asn1_expand_octet_string (ASN1_TYPE definitions, ASN1_TYPE * element,
+int
+asn1_expand_octet_string (asn_node_t definitions, asn_node_t * element,
 			  const char *octetName, const char *objectName)
 {
   char name[2 * ASN1_MAX_NAME_SIZE + 1], value[ASN1_MAX_NAME_SIZE];
-  asn1_retCode retCode = ASN1_SUCCESS, result;
+  int retCode = ASN1_SUCCESS, result;
   int len, len2, len3;
-  ASN1_TYPE p2, aux = ASN1_TYPE_EMPTY;
-  ASN1_TYPE octetNode = ASN1_TYPE_EMPTY, objectNode = ASN1_TYPE_EMPTY;
+  asn_node_t p2, aux = NULL;
+  asn_node_t octetNode = NULL, objectNode = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
 
-  if ((definitions == ASN1_TYPE_EMPTY) || (*element == ASN1_TYPE_EMPTY))
+  if ((definitions == NULL) || (*element == NULL))
     return ASN1_ELEMENT_NOT_FOUND;
 
   octetNode = asn1_find_node (*element, octetName);
-  if (octetNode == ASN1_TYPE_EMPTY)
+  if (octetNode == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
   if (type_field (octetNode->type) != TYPE_OCTET_STRING)
     return ASN1_ELEMENT_NOT_FOUND;
@@ -2815,7 +2815,7 @@ asn1_expand_octet_string (ASN1_TYPE definitions, ASN1_TYPE * element,
     return ASN1_VALUE_NOT_FOUND;
 
   objectNode = asn1_find_node (*element, objectName);
-  if (objectNode == ASN1_TYPE_EMPTY)
+  if (objectNode == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
 
   if (type_field (objectNode->type) != TYPE_OBJECT_ID)
@@ -2876,7 +2876,7 @@ asn1_expand_octet_string (ASN1_TYPE definitions, ASN1_TYPE * element,
 			  result = asn1_delete_structure (&octetNode);
 			  if (result == ASN1_SUCCESS)
 			    {
-			      aux = ASN1_TYPE_EMPTY;
+			      aux = NULL;
 			      break;
 			    }
 			  else
diff --git a/lib/element.c b/lib/element.c
index 2ee4950..ee10478 100644
--- a/lib/element.c
+++ b/lib/element.c
@@ -34,9 +34,9 @@
 #include "element.h"
 
 void
-_asn1_hierarchical_name (ASN1_TYPE node, char *name, int name_size)
+_asn1_hierarchical_name (asn_node_t node, char *name, int name_size)
 {
-  ASN1_TYPE p;
+  asn_node_t p;
   char tmp_name[64];
 
   p = node;
@@ -74,7 +74,7 @@ _asn1_hierarchical_name (ASN1_TYPE node, char *name, int name_size)
 /*   len: number of significant byte of value_out.                */
 /* Return: ASN1_MEM_ERROR or ASN1_SUCCESS                         */
 /******************************************************************/
-asn1_retCode
+int
 _asn1_convert_integer (const unsigned char *value, unsigned char *value_out,
 		       int value_out_size, int *len)
 {
@@ -127,9 +127,9 @@ _asn1_convert_integer (const unsigned char *value, unsigned char *value_out,
 
 
 int
-_asn1_append_sequence_set (ASN1_TYPE node)
+_asn1_append_sequence_set (asn_node_t node)
 {
-  ASN1_TYPE p, p2;
+  asn_node_t p, p2;
   char temp[10];
   long n;
 
@@ -267,11 +267,11 @@ _asn1_append_sequence_set (ASN1_TYPE node)
  *   %ASN1_ELEMENT_NOT_FOUND if @name is not a valid element, and
  *   %ASN1_VALUE_NOT_VALID if @ivalue has a wrong format.
  **/
-asn1_retCode
-asn1_write_value (ASN1_TYPE node_root, const char *name,
+int
+asn1_write_value (asn_node_t node_root, const char *name,
 		  const void *ivalue, int len)
 {
-  ASN1_TYPE node, p, p2;
+  asn_node_t node, p, p2;
   unsigned char *temp, *value_temp = NULL, *default_temp = NULL;
   int len2, k, k2, negative;
   size_t i;
@@ -693,10 +693,10 @@ asn1_write_value (ASN1_TYPE node_root, const char *name,
  *   to store the result, and in this case @len will contain the number of
  *   bytes needed.
  **/
-asn1_retCode
-asn1_read_value (ASN1_TYPE root, const char *name, void *ivalue, int *len)
+int
+asn1_read_value (asn_node_t root, const char *name, void *ivalue, int *len)
 {
-  ASN1_TYPE node, p, p2;
+  asn_node_t node, p, p2;
   int len2, len3;
   int value_size = *len;
   unsigned char *value = ivalue;
@@ -871,11 +871,11 @@ asn1_read_value (ASN1_TYPE root, const char *name, void *ivalue, int *len)
  * Returns: %ASN1_SUCCESS if successful, %ASN1_ELEMENT_NOT_FOUND if
  *   @name is not a valid element.
  **/
-asn1_retCode
-asn1_read_tag (ASN1_TYPE root, const char *name, int *tagValue,
+int
+asn1_read_tag (asn_node_t root, const char *name, int *tagValue,
 	       int *classValue)
 {
-  ASN1_TYPE node, p, pTag;
+  asn_node_t node, p, pTag;
 
   node = asn1_find_node (root, name);
   if (node == NULL)
@@ -974,14 +974,14 @@ asn1_read_tag (ASN1_TYPE root, const char *name, int *tagValue,
 /**
  * asn1_read_node_value:
  * @node: pointer to a node.
- * @data: a point to a node_data_struct
+ * @data: a point to a asn_data_node_st
  *
- * Returns the value a data node inside a ASN1_TYPE structure.
+ * Returns the value a data node inside a asn_node_t structure.
  * The data returned should be handled as constant values.
  *
  * Returns: %ASN1_SUCCESS if the node exists.
  **/
-asn1_retCode asn1_read_node_value (ASN1_TYPE node, ASN1_DATA_NODE* data)
+int asn1_read_node_value (asn_node_t node, asn_data_node_st* data)
 {
   data->name = node->name;
   data->value = node->value;
diff --git a/lib/element.h b/lib/element.h
index 9cad46e..d48f362 100644
--- a/lib/element.h
+++ b/lib/element.h
@@ -23,12 +23,12 @@
 #define _ELEMENT_H
 
 
-asn1_retCode _asn1_append_sequence_set (ASN1_TYPE node);
+int _asn1_append_sequence_set (asn_node_t node);
 
-asn1_retCode _asn1_convert_integer (const unsigned char *value,
+int _asn1_convert_integer (const unsigned char *value,
 				    unsigned char *value_out,
 				    int value_out_size, int *len);
 
-void _asn1_hierarchical_name (ASN1_TYPE node, char *name, int name_size);
+void _asn1_hierarchical_name (asn_node_t node, char *name, int name_size);
 
 #endif
diff --git a/lib/errors.c b/lib/errors.c
index 8b6e5e4..e01c3ee 100644
--- a/lib/errors.c
+++ b/lib/errors.c
@@ -68,7 +68,7 @@ static const libtasn1_error_entry error_algorithms[] = {
  * Since: 1.6
  **/
 void
-asn1_perror (asn1_retCode error)
+asn1_perror (int error)
 {
   const char *str = asn1_strerror (error);
   fprintf (stderr, "LIBTASN1 ERROR: %s\n", str ? str : "(null)");
@@ -90,7 +90,7 @@ asn1_perror (asn1_retCode error)
  * Since: 1.6
  **/
 const char *
-asn1_strerror (asn1_retCode error)
+asn1_strerror (int error)
 {
   const libtasn1_error_entry *p;
 
diff --git a/lib/int.h b/lib/int.h
index 9e6bc89..6643ffb 100644
--- a/lib/int.h
+++ b/lib/int.h
@@ -43,7 +43,7 @@
 /* This structure is also in libtasn1.h, but then contains less
    fields.  You cannot make any modifications to these first fields
    without breaking ABI.  */
-struct node_asn_struct
+struct asn_node_st
 {
   /* public fields: */
   char name[ASN1_MAX_NAME_SIZE+1];			/* Node name */
@@ -51,9 +51,9 @@ struct node_asn_struct
   unsigned int type;		/* Node type */
   unsigned char *value;		/* Node value */
   int value_len;
-  ASN1_TYPE down;		/* Pointer to the son node */
-  ASN1_TYPE right;		/* Pointer to the brother node */
-  ASN1_TYPE left;		/* Pointer to the next list element */
+  asn_node_t down;		/* Pointer to the son node */
+  asn_node_t right;		/* Pointer to the brother node */
+  asn_node_t left;		/* Pointer to the next list element */
   /* private fields: */
   unsigned char small_value[ASN1_SMALL_VALUE_SIZE];	/* For small values */
 };
@@ -75,11 +75,11 @@ uint32_t _asn1_bhash( const void *key, size_t length);
 
 /****************************************/
 /* Returns the first 8 bits.            */
-/* Used with the field type of node_asn */
+/* Used with the field type of asn_node_st */
 /****************************************/
 #define type_field(x)     (x&0xFF)
 
-/* List of constants for field type of typedef node_asn  */
+/* List of constants for field type of typedef asn_node_st  */
 #define TYPE_CONSTANT      ASN1_ETYPE_CONSTANT
 #define TYPE_IDENTIFIER    ASN1_ETYPE_IDENTIFIER
 #define TYPE_INTEGER       ASN1_ETYPE_INTEGER
@@ -105,7 +105,7 @@ uint32_t _asn1_bhash( const void *key, size_t length);
 
 
 /***********************************************************************/
-/* List of constants to better specify the type of typedef node_asn.   */
+/* List of constants to better specify the type of typedef asn_node_st.   */
 /***********************************************************************/
 /*  Used with TYPE_TAG  */
 #define CONST_UNIVERSAL   (1<<8)
diff --git a/lib/libtasn1.h b/lib/libtasn1.h
index 6293e7d..f5ecbd7 100644
--- a/lib/libtasn1.h
+++ b/lib/libtasn1.h
@@ -46,8 +46,6 @@ extern "C"
 
 #define ASN1_VERSION "3.0"
 
-  typedef int asn1_retCode;	/* type returned by libtasn1 functions */
-
   /*****************************************/
   /* Errors returned by libtasn1 functions */
   /*****************************************/
@@ -108,26 +106,25 @@ extern "C"
   /* that represent an ASN.1 DEFINITION.                */
   /******************************************************/
 
-  typedef struct node_asn_struct node_asn;
+  typedef struct asn_node_st asn_node_st;
 
-  typedef node_asn *ASN1_TYPE;
+  typedef asn_node_st *asn_node_t;
 
   /* maximum number of characters of a name */
   /* inside a file with ASN1 definitons     */
 #define ASN1_MAX_NAME_SIZE 64
 
-#define ASN1_TYPE_EMPTY  NULL
 
   /*****************************************/
   /* For the on-disk format of ASN.1 trees */
   /*****************************************/
-  struct static_struct_asn
+  struct asn_static_node_st
   {
     const char *name;		/* Node name */
     unsigned int type;		/* Node type */
     const void *value;		/* Node value */
   };
-  typedef struct static_struct_asn ASN1_ARRAY_TYPE;
+  typedef struct asn_static_node_st asn_static_node_t;
 
 /* List of constants for field type of typedef node_asn  */
 #define ASN1_ETYPE_CONSTANT       1
@@ -153,14 +150,14 @@ extern "C"
 #define ASN1_ETYPE_ENUMERATED    21
 #define ASN1_ETYPE_GENERALSTRING 27
 
-  struct node_data_struct
+  struct asn_data_node_st
   {
     const char *name;		/* Node name */
     const void *value;		/* Node value */
     unsigned int value_len;     /* Node value size */
     unsigned int type;		/* Node value type (ASN1_ETYPE_*) */
   };
-  typedef struct node_data_struct ASN1_DATA_NODE;
+  typedef struct asn_data_node_st asn_data_node_st;
 
   /***********************************/
   /*  Fixed constants                */
@@ -176,88 +173,88 @@ extern "C"
   /*  Functions definitions          */
   /***********************************/
 
-  extern ASN1_API asn1_retCode
+  extern ASN1_API int
     asn1_parser2tree (const char *file_name,
-		      ASN1_TYPE * definitions, char *errorDescription);
+		      asn_node_t * definitions, char *errorDescription);
 
-  extern ASN1_API asn1_retCode
+  extern ASN1_API int
     asn1_parser2array (const char *inputFileName,
 		       const char *outputFileName,
 		       const char *vectorName, char *errorDescription);
 
-  extern ASN1_API asn1_retCode
-    asn1_array2tree (const ASN1_ARRAY_TYPE * array,
-		     ASN1_TYPE * definitions, char *errorDescription);
+  extern ASN1_API int
+    asn1_array2tree (const asn_static_node_t * array,
+		     asn_node_t * definitions, char *errorDescription);
 
   extern ASN1_API void
-    asn1_print_structure (FILE * out, ASN1_TYPE structure,
+    asn1_print_structure (FILE * out, asn_node_t structure,
 			  const char *name, int mode);
 
-  extern ASN1_API asn1_retCode
-    asn1_create_element (ASN1_TYPE definitions,
-			 const char *source_name, ASN1_TYPE * element);
+  extern ASN1_API int
+    asn1_create_element (asn_node_t definitions,
+			 const char *source_name, asn_node_t * element);
 
-  extern ASN1_API asn1_retCode asn1_delete_structure (ASN1_TYPE * structure);
+  extern ASN1_API int asn1_delete_structure (asn_node_t * structure);
 
-  extern ASN1_API asn1_retCode
-    asn1_delete_element (ASN1_TYPE structure, const char *element_name);
+  extern ASN1_API int
+    asn1_delete_element (asn_node_t structure, const char *element_name);
 
-  extern ASN1_API asn1_retCode
-    asn1_write_value (ASN1_TYPE node_root, const char *name,
+  extern ASN1_API int
+    asn1_write_value (asn_node_t node_root, const char *name,
 		      const void *ivalue, int len);
 
-  extern ASN1_API asn1_retCode
-    asn1_read_value (ASN1_TYPE root, const char *name,
+  extern ASN1_API int
+    asn1_read_value (asn_node_t root, const char *name,
 		     void *ivalue, int *len);
 
-  extern ASN1_API asn1_retCode
-    asn1_read_node_value (ASN1_TYPE node, ASN1_DATA_NODE* data);
+  extern ASN1_API int
+    asn1_read_node_value (asn_node_t node, asn_data_node_st* data);
 
-  extern ASN1_API asn1_retCode
-    asn1_number_of_elements (ASN1_TYPE element, const char *name, int *num);
+  extern ASN1_API int
+    asn1_number_of_elements (asn_node_t element, const char *name, int *num);
 
-  extern ASN1_API asn1_retCode
-    asn1_der_coding (ASN1_TYPE element, const char *name,
+  extern ASN1_API int
+    asn1_der_coding (asn_node_t element, const char *name,
 		     void *ider, int *len, char *ErrorDescription);
 
-  extern ASN1_API asn1_retCode
-    asn1_der_decoding (ASN1_TYPE * element, const void *ider,
+  extern ASN1_API int
+    asn1_der_decoding (asn_node_t * element, const void *ider,
 		       int len, char *errorDescription);
 
-  extern ASN1_API asn1_retCode
-    asn1_der_decoding_element (ASN1_TYPE * structure,
+  extern ASN1_API int
+    asn1_der_decoding_element (asn_node_t * structure,
 			       const char *elementName,
 			       const void *ider, int len,
 			       char *errorDescription);
 
-  extern ASN1_API asn1_retCode
-    asn1_der_decoding_startEnd (ASN1_TYPE element,
+  extern ASN1_API int
+    asn1_der_decoding_startEnd (asn_node_t element,
 				const void *ider, int len,
 				const char *name_element,
 				int *start, int *end);
 
-  extern ASN1_API asn1_retCode
-    asn1_expand_any_defined_by (ASN1_TYPE definitions, ASN1_TYPE * element);
+  extern ASN1_API int
+    asn1_expand_any_defined_by (asn_node_t definitions, asn_node_t * element);
 
-  extern ASN1_API asn1_retCode
-    asn1_expand_octet_string (ASN1_TYPE definitions,
-			      ASN1_TYPE * element,
+  extern ASN1_API int
+    asn1_expand_octet_string (asn_node_t definitions,
+			      asn_node_t * element,
 			      const char *octetName, const char *objectName);
 
-  extern ASN1_API asn1_retCode
-    asn1_read_tag (ASN1_TYPE root, const char *name,
+  extern ASN1_API int
+    asn1_read_tag (asn_node_t root, const char *name,
 		   int *tagValue, int *classValue);
 
-  extern ASN1_API const char *asn1_find_structure_from_oid (ASN1_TYPE
+  extern ASN1_API const char *asn1_find_structure_from_oid (asn_node_t
 							    definitions,
 							    const char
 							    *oidValue);
 
   extern ASN1_API const char *asn1_check_version (const char *req_version);
 
-  extern ASN1_API const char *asn1_strerror (asn1_retCode error);
+  extern ASN1_API const char *asn1_strerror (int error);
 
-  extern ASN1_API void asn1_perror (asn1_retCode error);
+  extern ASN1_API void asn1_perror (int error);
 
   /* DER utility functions. */
 
@@ -269,7 +266,7 @@ extern "C"
     asn1_octet_der (const unsigned char *str, int str_len,
 		    unsigned char *der, int *der_len);
 
-  extern ASN1_API asn1_retCode
+  extern ASN1_API int
     asn1_get_octet_der (const unsigned char *der, int der_len,
 			int *ret_len, unsigned char *str,
 			int str_size, int *str_len);
@@ -277,7 +274,7 @@ extern "C"
   extern ASN1_API void asn1_bit_der (const unsigned char *str, int bit_len,
 				     unsigned char *der, int *der_len);
 
-  extern ASN1_API asn1_retCode
+  extern ASN1_API int
     asn1_get_bit_der (const unsigned char *der, int der_len,
 		      int *ret_len, unsigned char *str,
 		      int str_size, int *bit_len);
@@ -293,12 +290,26 @@ extern "C"
 
   /* Other utility functions. */
 
-  extern ASN1_API ASN1_TYPE
-    asn1_find_node (ASN1_TYPE pointer, const char *name);
+  extern ASN1_API asn_node_t
+    asn1_find_node (asn_node_t pointer, const char *name);
+
+  extern ASN1_API int
+    asn1_copy_node (asn_node_t dst, const char *dst_name,
+		    asn_node_t src, const char *src_name);
+
+/* Compatibility types */
+  typedef int asn1_retCode;	/* type returned by libtasn1 functions */
+
+#define node_asn_struct asn_node_st
+#define node_asn asn_node_st
+#define ASN1_TYPE asn_node_t
+#define ASN1_TYPE_EMPTY NULL
+
+#define static_struct_asn asn_static_node_st
+#define ASN1_ARRAY_TYPE asn_static_node_t
 
-  extern ASN1_API asn1_retCode
-    asn1_copy_node (ASN1_TYPE dst, const char *dst_name,
-		    ASN1_TYPE src, const char *src_name);
+#define node_data_struct asn_data_node_st
+#define ASN1_DATA_NODE asn_data_node_st
 
 #ifdef __cplusplus
 }
diff --git a/lib/parser_aux.c b/lib/parser_aux.c
index ff701bc..b52ad89 100644
--- a/lib/parser_aux.c
+++ b/lib/parser_aux.c
@@ -34,7 +34,7 @@ char _asn1_identifierMissing[ASN1_MAX_NAME_SIZE + 1];	/* identifier name not fou
 /***********************************************/
 typedef struct list_struct
 {
-  ASN1_TYPE node;
+  asn_node_t node;
   struct list_struct *next;
 } list_type;
 
@@ -51,13 +51,13 @@ list_type *firstElement = NULL;
 /*         and CONST_ constants).                     */
 /* Return: pointer to the new element.                */
 /******************************************************/
-ASN1_TYPE
+asn_node_t
 _asn1_add_static_node (unsigned int type)
 {
   list_type *listElement;
-  ASN1_TYPE punt;
+  asn_node_t punt;
 
-  punt = calloc (1, sizeof (struct node_asn_struct));
+  punt = calloc (1, sizeof (struct asn_node_st));
   if (punt == NULL)
     return NULL;
 
@@ -89,10 +89,10 @@ _asn1_add_static_node (unsigned int type)
  *
  * Returns: the search result, or %NULL if not found.
  **/
-ASN1_TYPE
-asn1_find_node (ASN1_TYPE pointer, const char *name)
+asn_node_t
+asn1_find_node (asn_node_t pointer, const char *name)
 {
-  ASN1_TYPE p;
+  asn_node_t p;
   char *n_end, n[ASN1_MAX_NAME_SIZE + 1];
   const char *n_start;
   unsigned int nsize;
@@ -207,8 +207,8 @@ asn1_find_node (ASN1_TYPE pointer, const char *name)
 /*   len: character number of value.                              */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-ASN1_TYPE
-_asn1_set_value (ASN1_TYPE node, const void *value, unsigned int len)
+asn_node_t
+_asn1_set_value (asn_node_t node, const void *value, unsigned int len)
 {
   if (node == NULL)
     return node;
@@ -250,8 +250,8 @@ _asn1_set_value (ASN1_TYPE node, const void *value, unsigned int len)
 /*   len: character number of value.                              */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-ASN1_TYPE
-_asn1_set_value_octet (ASN1_TYPE node, const void *value, unsigned int len)
+asn_node_t
+_asn1_set_value_octet (asn_node_t node, const void *value, unsigned int len)
 {
   int len2;
   void *temp;
@@ -271,8 +271,8 @@ _asn1_set_value_octet (ASN1_TYPE node, const void *value, unsigned int len)
 /* the same as _asn1_set_value except that it sets an already malloc'ed
  * value.
  */
-ASN1_TYPE
-_asn1_set_value_m (ASN1_TYPE node, void *value, unsigned int len)
+asn_node_t
+_asn1_set_value_m (asn_node_t node, void *value, unsigned int len)
 {
   if (node == NULL)
     return node;
@@ -304,8 +304,8 @@ _asn1_set_value_m (ASN1_TYPE node, void *value, unsigned int len)
 /*   len: character number of value.                              */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-ASN1_TYPE
-_asn1_append_value (ASN1_TYPE node, const void *value, unsigned int len)
+asn_node_t
+_asn1_append_value (asn_node_t node, const void *value, unsigned int len)
 {
   if (node == NULL)
     return node;
@@ -354,8 +354,8 @@ _asn1_append_value (ASN1_TYPE node, const void *value, unsigned int len)
 /*         to set.                                                */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-ASN1_TYPE
-_asn1_set_name (ASN1_TYPE node, const char *name)
+asn_node_t
+_asn1_set_name (asn_node_t node, const char *name)
 {
 unsigned int nsize;
 
@@ -383,8 +383,8 @@ unsigned int nsize;
 /*   src: a source element pointer.                               */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-ASN1_TYPE
-_asn1_cpy_name (ASN1_TYPE dst, ASN1_TYPE src)
+asn_node_t
+_asn1_cpy_name (asn_node_t dst, asn_node_t src)
 {
 unsigned int nsize;
 
@@ -413,8 +413,8 @@ unsigned int nsize;
 /*          by NODE.                                              */
 /* Return: pointer to *NODE.                                      */
 /******************************************************************/
-ASN1_TYPE
-_asn1_set_right (ASN1_TYPE node, ASN1_TYPE right)
+asn_node_t
+_asn1_set_right (asn_node_t node, asn_node_t right)
 {
   if (node == NULL)
     return node;
@@ -432,10 +432,10 @@ _asn1_set_right (ASN1_TYPE node, ASN1_TYPE right)
 /*   node: starting element pointer.                              */
 /* Return: pointer to the last element along the right chain.     */
 /******************************************************************/
-ASN1_TYPE
-_asn1_get_last_right (ASN1_TYPE node)
+asn_node_t
+_asn1_get_last_right (asn_node_t node)
 {
-  ASN1_TYPE p;
+  asn_node_t p;
 
   if (node == NULL)
     return NULL;
@@ -453,7 +453,7 @@ _asn1_get_last_right (ASN1_TYPE node)
 /*   node: NODE_ASN element pointer.                              */
 /******************************************************************/
 void
-_asn1_remove_node (ASN1_TYPE node)
+_asn1_remove_node (asn_node_t node)
 {
   if (node == NULL)
     return;
@@ -470,10 +470,10 @@ _asn1_remove_node (ASN1_TYPE node)
 /*   node: NODE_ASN element pointer.                              */
 /* Return: Null if not found.                                     */
 /******************************************************************/
-ASN1_TYPE
-_asn1_find_up (ASN1_TYPE node)
+asn_node_t
+_asn1_find_up (asn_node_t node)
 {
-  ASN1_TYPE p;
+  asn_node_t p;
 
   if (node == NULL)
     return NULL;
@@ -568,10 +568,10 @@ _asn1_ltostr (long v, char *str)
 /*   ASN1_ELEMENT_NOT_FOUND if NODE is NULL,                       */
 /*   otherwise ASN1_SUCCESS                                             */
 /******************************************************************/
-asn1_retCode
-_asn1_change_integer_value (ASN1_TYPE node)
+int
+_asn1_change_integer_value (asn_node_t node)
 {
-  ASN1_TYPE p;
+  asn_node_t p;
   unsigned char val[SIZEOF_UNSIGNED_LONG_INT];
   unsigned char val2[SIZEOF_UNSIGNED_LONG_INT + 1];
   int len;
@@ -635,10 +635,10 @@ _asn1_change_integer_value (ASN1_TYPE node)
 /*   ASN1_ELEMENT_NOT_FOUND if NODE is NULL,                       */
 /*   otherwise ASN1_SUCCESS                                             */
 /******************************************************************/
-asn1_retCode
-_asn1_expand_object_id (ASN1_TYPE node)
+int
+_asn1_expand_object_id (asn_node_t node)
 {
-  ASN1_TYPE p, p2, p3, p4, p5;
+  asn_node_t p, p2, p3, p4, p5;
   char name_root[ASN1_MAX_NAME_SIZE], name2[2 * ASN1_MAX_NAME_SIZE + 1];
   int move, tlen;
 
@@ -818,10 +818,10 @@ _asn1_expand_object_id (ASN1_TYPE node)
 /*   ASN1_ELEMENT_NOT_FOUND if NODE is NULL,                       */
 /*   otherwise ASN1_SUCCESS                                             */
 /******************************************************************/
-asn1_retCode
-_asn1_type_set_config (ASN1_TYPE node)
+int
+_asn1_type_set_config (asn_node_t node)
 {
-  ASN1_TYPE p, p2;
+  asn_node_t p, p2;
   int move;
 
   if (node == NULL)
@@ -891,10 +891,10 @@ _asn1_type_set_config (ASN1_TYPE node)
 /*   ASN1_IDENTIFIER_NOT_FOUND   if an identifier is not defined, */
 /*   otherwise ASN1_SUCCESS                                       */
 /******************************************************************/
-asn1_retCode
-_asn1_check_identifier (ASN1_TYPE node)
+int
+_asn1_check_identifier (asn_node_t node)
 {
-  ASN1_TYPE p, p2;
+  asn_node_t p, p2;
   char name2[ASN1_MAX_NAME_SIZE * 2 + 2];
 
   if (node == NULL)
@@ -998,10 +998,10 @@ _asn1_check_identifier (ASN1_TYPE node)
 /*     a DEFINITIONS element,                                     */
 /*   otherwise ASN1_SUCCESS                                       */
 /******************************************************************/
-asn1_retCode
-_asn1_set_default_tag (ASN1_TYPE node)
+int
+_asn1_set_default_tag (asn_node_t node)
 {
-  ASN1_TYPE p;
+  asn_node_t p;
 
   if ((node == NULL) || (type_field (node->type) != TYPE_DEFINITIONS))
     return ASN1_ELEMENT_NOT_FOUND;
diff --git a/lib/parser_aux.h b/lib/parser_aux.h
index f3aeb54..a224e78 100644
--- a/lib/parser_aux.h
+++ b/lib/parser_aux.h
@@ -27,28 +27,28 @@
 /***************************************/
 /*  Functions used by ASN.1 parser     */
 /***************************************/
-ASN1_TYPE _asn1_add_static_node (unsigned int type);
+asn_node_t _asn1_add_static_node (unsigned int type);
 
-ASN1_TYPE
-_asn1_set_value (ASN1_TYPE node, const void *value, unsigned int len);
+asn_node_t
+_asn1_set_value (asn_node_t node, const void *value, unsigned int len);
 
-ASN1_TYPE _asn1_set_value_m (ASN1_TYPE node, void *value, unsigned int len);
+asn_node_t _asn1_set_value_m (asn_node_t node, void *value, unsigned int len);
 
-ASN1_TYPE
-_asn1_set_value_octet (ASN1_TYPE node, const void *value, unsigned int len);
+asn_node_t
+_asn1_set_value_octet (asn_node_t node, const void *value, unsigned int len);
 
-ASN1_TYPE
-_asn1_append_value (ASN1_TYPE node, const void *value, unsigned int len);
+asn_node_t
+_asn1_append_value (asn_node_t node, const void *value, unsigned int len);
 
-ASN1_TYPE _asn1_set_name (ASN1_TYPE node, const char *name);
+asn_node_t _asn1_set_name (asn_node_t node, const char *name);
 
-ASN1_TYPE _asn1_cpy_name (ASN1_TYPE dst, ASN1_TYPE src);
+asn_node_t _asn1_cpy_name (asn_node_t dst, asn_node_t src);
 
-ASN1_TYPE _asn1_set_right (ASN1_TYPE node, ASN1_TYPE right);
+asn_node_t _asn1_set_right (asn_node_t node, asn_node_t right);
 
-ASN1_TYPE _asn1_get_last_right (ASN1_TYPE node);
+asn_node_t _asn1_get_last_right (asn_node_t node);
 
-void _asn1_remove_node (ASN1_TYPE node);
+void _asn1_remove_node (asn_node_t node);
 
 void _asn1_delete_list (void);
 
@@ -56,17 +56,17 @@ void _asn1_delete_list_and_nodes (void);
 
 char *_asn1_ltostr (long v, char *str);
 
-ASN1_TYPE _asn1_find_up (ASN1_TYPE node);
+asn_node_t _asn1_find_up (asn_node_t node);
 
-asn1_retCode _asn1_change_integer_value (ASN1_TYPE node);
+int _asn1_change_integer_value (asn_node_t node);
 
-asn1_retCode _asn1_expand_object_id (ASN1_TYPE node);
+int _asn1_expand_object_id (asn_node_t node);
 
-asn1_retCode _asn1_type_set_config (ASN1_TYPE node);
+int _asn1_type_set_config (asn_node_t node);
 
-asn1_retCode _asn1_check_identifier (ASN1_TYPE node);
+int _asn1_check_identifier (asn_node_t node);
 
-asn1_retCode _asn1_set_default_tag (ASN1_TYPE node);
+int _asn1_set_default_tag (asn_node_t node);
 
 /******************************************************************/
 /* Function : _asn1_get_right                                     */
@@ -76,8 +76,8 @@ asn1_retCode _asn1_set_default_tag (ASN1_TYPE node);
 /*   node: NODE_ASN element pointer.                              */
 /* Return: field RIGHT of NODE.                                   */
 /******************************************************************/
-inline static ASN1_TYPE
-_asn1_get_right (ASN1_TYPE node)
+inline static asn_node_t
+_asn1_get_right (asn_node_t node)
 {
   if (node == NULL)
     return NULL;
@@ -93,8 +93,8 @@ _asn1_get_right (ASN1_TYPE node)
 /*          by NODE.                                              */
 /* Return: pointer to *NODE.                                      */
 /******************************************************************/
-inline static ASN1_TYPE
-_asn1_set_down (ASN1_TYPE node, ASN1_TYPE down)
+inline static asn_node_t
+_asn1_set_down (asn_node_t node, asn_node_t down)
 {
   if (node == NULL)
     return node;
@@ -112,8 +112,8 @@ _asn1_set_down (ASN1_TYPE node, ASN1_TYPE down)
 /*   node: NODE_ASN element pointer.                              */
 /* Return: field DOWN of NODE.                                    */
 /******************************************************************/
-inline static ASN1_TYPE
-_asn1_get_down (ASN1_TYPE node)
+inline static asn_node_t
+_asn1_get_down (asn_node_t node)
 {
   if (node == NULL)
     return NULL;
@@ -128,7 +128,7 @@ _asn1_get_down (ASN1_TYPE node)
 /* Return: a null terminated string.                              */
 /******************************************************************/
 inline static char *
-_asn1_get_name (ASN1_TYPE node)
+_asn1_get_name (asn_node_t node)
 {
   if (node == NULL)
     return NULL;
@@ -146,8 +146,8 @@ _asn1_get_name (ASN1_TYPE node)
 /*          value of field TYPE.                                  */
 /* Return: NODE pointer.                                          */
 /******************************************************************/
-inline static ASN1_TYPE
-_asn1_mod_type (ASN1_TYPE node, unsigned int value)
+inline static asn_node_t
+_asn1_mod_type (asn_node_t node, unsigned int value)
 {
   if (node == NULL)
     return node;
diff --git a/lib/structure.c b/lib/structure.c
index 7d622ce..4ce9f6a 100644
--- a/lib/structure.c
+++ b/lib/structure.c
@@ -44,12 +44,12 @@ extern char _asn1_identifierMissing[];
 /*         and CONST_ constants).                     */
 /* Return: pointer to the new element.                */
 /******************************************************/
-ASN1_TYPE
+asn_node_t
 _asn1_add_single_node (unsigned int type)
 {
-  ASN1_TYPE punt;
+  asn_node_t punt;
 
-  punt = calloc (1, sizeof (struct node_asn_struct));
+  punt = calloc (1, sizeof (struct asn_node_st));
   if (punt == NULL)
     return NULL;
 
@@ -67,8 +67,8 @@ _asn1_add_single_node (unsigned int type)
 /*   node: NODE_ASN element pointer.                              */
 /* Return: NULL if not found.                                     */
 /******************************************************************/
-ASN1_TYPE
-_asn1_find_left (ASN1_TYPE node)
+asn_node_t
+_asn1_find_left (asn_node_t node)
 {
   if ((node == NULL) || (node->left == NULL) || (node->left->down == node))
     return NULL;
@@ -77,12 +77,12 @@ _asn1_find_left (ASN1_TYPE node)
 }
 
 
-asn1_retCode
-_asn1_create_static_structure (ASN1_TYPE pointer, char *output_file_name,
+int
+_asn1_create_static_structure (asn_node_t pointer, char *output_file_name,
 			       char *vector_name)
 {
   FILE *file;
-  ASN1_TYPE p;
+  asn_node_t p;
   unsigned long t;
 
   file = fopen (output_file_name, "w");
@@ -96,7 +96,7 @@ _asn1_create_static_structure (ASN1_TYPE pointer, char *output_file_name,
 
   fprintf (file, "#include <libtasn1.h>\n\n");
 
-  fprintf (file, "const ASN1_ARRAY_TYPE %s[] = {\n", vector_name);
+  fprintf (file, "const asn_static_node_t %s[] = {\n", vector_name);
 
   p = pointer;
 
@@ -168,22 +168,22 @@ _asn1_create_static_structure (ASN1_TYPE pointer, char *output_file_name,
  * @array is a vector created by asn1_parser2array().
  *
  * Returns: %ASN1_SUCCESS if structure was created correctly,
- *   %ASN1_ELEMENT_NOT_EMPTY if *@definitions not ASN1_TYPE_EMPTY,
+ *   %ASN1_ELEMENT_NOT_EMPTY if *@definitions not NULL,
  *   %ASN1_IDENTIFIER_NOT_FOUND if in the file there is an identifier
  *   that is not defined (see @errorDescription for more information),
  *   %ASN1_ARRAY_ERROR if the array pointed by @array is wrong.
  **/
-asn1_retCode
-asn1_array2tree (const ASN1_ARRAY_TYPE * array, ASN1_TYPE * definitions,
+int
+asn1_array2tree (const asn_static_node_t * array, asn_node_t * definitions,
 		 char *errorDescription)
 {
-  ASN1_TYPE p, p_last = NULL;
+  asn_node_t p, p_last = NULL;
   unsigned long k;
   int move;
-  asn1_retCode result;
+  int result;
 
 
-  if (*definitions != ASN1_TYPE_EMPTY)
+  if (*definitions != NULL)
     return ASN1_ELEMENT_NOT_EMPTY;
 
   move = UP;
@@ -263,7 +263,7 @@ asn1_array2tree (const ASN1_ARRAY_TYPE * array, ASN1_TYPE * definitions,
   if (result != ASN1_SUCCESS)
     {
       _asn1_delete_list_and_nodes ();
-      *definitions = ASN1_TYPE_EMPTY;
+      *definitions = NULL;
     }
   else
     _asn1_delete_list ();
@@ -276,17 +276,17 @@ asn1_array2tree (const ASN1_ARRAY_TYPE * array, ASN1_TYPE * definitions,
  * @structure: pointer to the structure that you want to delete.
  *
  * Deletes the structure *@structure.  At the end, *@structure is set
- * to ASN1_TYPE_EMPTY.
+ * to NULL.
  *
  * Returns: %ASN1_SUCCESS if successful, %ASN1_ELEMENT_NOT_FOUND if
- *   *@structure was ASN1_TYPE_EMPTY.
+ *   *@structure was NULL.
  **/
-asn1_retCode
-asn1_delete_structure (ASN1_TYPE * structure)
+int
+asn1_delete_structure (asn_node_t * structure)
 {
-  ASN1_TYPE p, p2, p3;
+  asn_node_t p, p2, p3;
 
-  if (*structure == ASN1_TYPE_EMPTY)
+  if (*structure == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
 
   p = *structure;
@@ -328,7 +328,7 @@ asn1_delete_structure (ASN1_TYPE * structure)
 	}
     }
 
-  *structure = ASN1_TYPE_EMPTY;
+  *structure = NULL;
   return ASN1_SUCCESS;
 }
 
@@ -345,14 +345,14 @@ asn1_delete_structure (ASN1_TYPE * structure)
  * Returns: %ASN1_SUCCESS if successful, %ASN1_ELEMENT_NOT_FOUND if
  *   the @element_name was not found.
  **/
-asn1_retCode
-asn1_delete_element (ASN1_TYPE structure, const char *element_name)
+int
+asn1_delete_element (asn_node_t structure, const char *element_name)
 {
-  ASN1_TYPE p2, p3, source_node;
+  asn_node_t p2, p3, source_node;
 
   source_node = asn1_find_node (structure, element_name);
 
-  if (source_node == ASN1_TYPE_EMPTY)
+  if (source_node == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
 
   p2 = source_node->right;
@@ -371,10 +371,10 @@ asn1_delete_element (ASN1_TYPE structure, const char *element_name)
   return asn1_delete_structure (&source_node);
 }
 
-ASN1_TYPE
-_asn1_copy_structure3 (ASN1_TYPE source_node)
+asn_node_t
+_asn1_copy_structure3 (asn_node_t source_node)
 {
-  ASN1_TYPE dest_node, p_s, p_d, p_d_prev;
+  asn_node_t dest_node, p_s, p_d, p_d_prev;
   int move;
 
   if (source_node == NULL)
@@ -429,10 +429,10 @@ _asn1_copy_structure3 (ASN1_TYPE source_node)
 }
 
 
-static ASN1_TYPE
-_asn1_copy_structure2 (ASN1_TYPE root, const char *source_name)
+static asn_node_t
+_asn1_copy_structure2 (asn_node_t root, const char *source_name)
 {
-  ASN1_TYPE source_node;
+  asn_node_t source_node;
 
   source_node = asn1_find_node (root, source_name);
 
@@ -441,10 +441,10 @@ _asn1_copy_structure2 (ASN1_TYPE root, const char *source_name)
 }
 
 
-static asn1_retCode
-_asn1_type_choice_config (ASN1_TYPE node)
+static int
+_asn1_type_choice_config (asn_node_t node)
 {
-  ASN1_TYPE p, p2, p3, p4;
+  asn_node_t p, p2, p3, p4;
   int move, tlen;
 
   if (node == NULL)
@@ -526,10 +526,10 @@ _asn1_type_choice_config (ASN1_TYPE node)
 }
 
 
-static asn1_retCode
-_asn1_expand_identifier (ASN1_TYPE * node, ASN1_TYPE root)
+static int
+_asn1_expand_identifier (asn_node_t * node, asn_node_t root)
 {
-  ASN1_TYPE p, p2, p3;
+  asn_node_t p, p2, p3;
   char name2[ASN1_MAX_NAME_SIZE + 2];
   int move;
 
@@ -648,11 +648,11 @@ _asn1_expand_identifier (ASN1_TYPE * node, ASN1_TYPE root)
  * Returns: %ASN1_SUCCESS if creation OK, %ASN1_ELEMENT_NOT_FOUND if
  *   @source_name is not known.
  **/
-asn1_retCode
-asn1_create_element (ASN1_TYPE definitions, const char *source_name,
-		     ASN1_TYPE * element)
+int
+asn1_create_element (asn_node_t definitions, const char *source_name,
+		     asn_node_t * element)
 {
-  ASN1_TYPE dest_node;
+  asn_node_t dest_node;
   int res;
 
   dest_node = _asn1_copy_structure2 (definitions, source_name);
@@ -684,10 +684,10 @@ asn1_create_element (ASN1_TYPE definitions, const char *source_name,
  * from the @name element inside the structure @structure.
  **/
 void
-asn1_print_structure (FILE * out, ASN1_TYPE structure, const char *name,
+asn1_print_structure (FILE * out, asn_node_t structure, const char *name,
 		      int mode)
 {
-  ASN1_TYPE p, root;
+  asn_node_t p, root;
   int k, indent = 0, len, len2, len3;
 
   if (out == NULL)
@@ -1047,10 +1047,10 @@ asn1_print_structure (FILE * out, ASN1_TYPE structure, const char *name,
  * Returns: %ASN1_SUCCESS if successful, %ASN1_ELEMENT_NOT_FOUND if
  *   @name is not known, %ASN1_GENERIC_ERROR if pointer @num is %NULL.
  **/
-asn1_retCode
-asn1_number_of_elements (ASN1_TYPE element, const char *name, int *num)
+int
+asn1_number_of_elements (asn_node_t element, const char *name, int *num)
 {
-  ASN1_TYPE node, p;
+  asn_node_t node, p;
 
   if (num == NULL)
     return ASN1_GENERIC_ERROR;
@@ -1086,15 +1086,15 @@ asn1_number_of_elements (ASN1_TYPE element, const char *name, int *num)
  *   the OID.
  **/
 const char *
-asn1_find_structure_from_oid (ASN1_TYPE definitions, const char *oidValue)
+asn1_find_structure_from_oid (asn_node_t definitions, const char *oidValue)
 {
   char definitionsName[ASN1_MAX_NAME_SIZE], name[2 * ASN1_MAX_NAME_SIZE + 1];
   char value[ASN1_MAX_NAME_SIZE];
-  ASN1_TYPE p;
+  asn_node_t p;
   int len;
-  asn1_retCode result;
+  int result;
 
-  if ((definitions == ASN1_TYPE_EMPTY) || (oidValue == NULL))
+  if ((definitions == NULL) || (oidValue == NULL))
     return NULL;		/* ASN1_ELEMENT_NOT_FOUND; */
 
 
@@ -1131,24 +1131,24 @@ asn1_find_structure_from_oid (ASN1_TYPE definitions, const char *oidValue)
 
 /**
  * asn1_copy_node:
- * @dst: Destination ASN1_TYPE node.
+ * @dst: Destination asn_node_t node.
  * @dst_name: Field name in destination node.
- * @src: Source ASN1_TYPE node.
+ * @src: Source asn_node_t node.
  * @src_name: Field name in source node.
  *
- * Create a deep copy of a ASN1_TYPE variable.
+ * Create a deep copy of a asn_node_t variable.
  *
  * Returns: Return %ASN1_SUCCESS on success.
  **/
-asn1_retCode
-asn1_copy_node (ASN1_TYPE dst, const char *dst_name,
-		ASN1_TYPE src, const char *src_name)
+int
+asn1_copy_node (asn_node_t dst, const char *dst_name,
+		asn_node_t src, const char *src_name)
 {
 /* FIXME: rewrite using copy_structure().
  * It seems quite hard to do.
  */
   int result;
-  ASN1_TYPE dst_node;
+  asn_node_t dst_node;
   void *data = NULL;
   int size = 0;
 
diff --git a/lib/structure.h b/lib/structure.h
index cf4205b..db7e3be 100644
--- a/lib/structure.h
+++ b/lib/structure.h
@@ -28,14 +28,14 @@
 #ifndef _STRUCTURE_H
 #define _STRUCTURE_H
 
-asn1_retCode _asn1_create_static_structure (ASN1_TYPE pointer,
+int _asn1_create_static_structure (asn_node_t pointer,
 					    char *output_file_name,
 					    char *vector_name);
 
-ASN1_TYPE _asn1_copy_structure3 (ASN1_TYPE source_node);
+asn_node_t _asn1_copy_structure3 (asn_node_t source_node);
 
-ASN1_TYPE _asn1_add_single_node (unsigned int type);
+asn_node_t _asn1_add_single_node (unsigned int type);
 
-ASN1_TYPE _asn1_find_left (ASN1_TYPE node);
+asn_node_t _asn1_find_left (asn_node_t node);
 
 #endif
diff --git a/src/asn1Coding.c b/src/asn1Coding.c
index 9ddb0a4..b9a7ca3 100644
--- a/src/asn1Coding.c
+++ b/src/asn1Coding.c
@@ -133,8 +133,8 @@ main (int argc, char *argv[])
   char *inputFileAsnName = NULL;
   char *inputFileAssignmentName = NULL;
   int checkSyntaxOnly = 0;
-  ASN1_TYPE definitions = ASN1_TYPE_EMPTY;
-  ASN1_TYPE structure = ASN1_TYPE_EMPTY;
+  asn_node_t definitions = NULL;
+  asn_node_t structure = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   int asn1_result = ASN1_SUCCESS;
   FILE *outputFile;
@@ -248,7 +248,7 @@ main (int argc, char *argv[])
   while (readAssignment (inputFile, varName, value) == ASSIGNMENT_SUCCESS)
     {
       printf ("var=%s, value=%s\n", varName, value);
-      if (structure == ASN1_TYPE_EMPTY)
+      if (structure == NULL)
 	{
 	  asn1_result = asn1_create_element (definitions, value, &structure);
 	}
diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c
index c46e43b..f942734 100644
--- a/src/asn1Decoding.c
+++ b/src/asn1Decoding.c
@@ -33,7 +33,7 @@
 #include <read-file.h>
 #include "benchmark.h"
 
-static int decode(ASN1_TYPE definitions, const char* typeName, void* der, int der_len, int benchmark);
+static int decode(asn_node_t definitions, const char* typeName, void* der, int der_len, int benchmark);
 
 /* This feature is available in gcc versions 2.5 and later.  */
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
   char *inputFileAsnName = NULL;
   char *inputFileDerName = NULL;
   char *typeName = NULL;
-  ASN1_TYPE definitions = ASN1_TYPE_EMPTY;
+  asn_node_t definitions = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   int asn1_result = ASN1_SUCCESS;
   unsigned char *der;
@@ -224,11 +224,11 @@ main (int argc, char *argv[])
   exit (0);
 }
 
-static int simple_decode(ASN1_TYPE definitions, const char* typeName, void* der, int der_len, int benchmark)
+static int simple_decode(asn_node_t definitions, const char* typeName, void* der, int der_len, int benchmark)
 {
   
 int asn1_result;
-ASN1_TYPE structure = ASN1_TYPE_EMPTY;
+asn_node_t structure = NULL;
 char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
 
   asn1_result = asn1_create_element (definitions, typeName, &structure);
@@ -263,7 +263,7 @@ char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   return ASN1_SUCCESS;
 }
 
-static int decode(ASN1_TYPE definitions, const char* typeName, void* der, int der_len, int benchmark)
+static int decode(asn_node_t definitions, const char* typeName, void* der, int der_len, int benchmark)
 {
 struct benchmark_st st;
 
diff --git a/src/asn1Parser.c b/src/asn1Parser.c
index e14da83..4bd4d68 100644
--- a/src/asn1Parser.c
+++ b/src/asn1Parser.c
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
   char *inputFileName = NULL;
   char *vectorName = NULL;
   int checkSyntaxOnly = 0;
-  ASN1_TYPE pointer = ASN1_TYPE_EMPTY;
+  asn_node_t pointer = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   int parse_result = ASN1_SUCCESS;
 


hooks/post-receive
-- 
GNU libtasn1


From MAILER-DAEMON Tue Oct 02 14:21:36 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TJ768-0006lo-68
	for mharc-libtasn1-commit@gnu.org; Tue, 02 Oct 2012 14:21:36 -0400
Received: from eggs.gnu.org ([208.118.235.92]:51063)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TJ763-0006X5-9x
	for libtasn1-commit@gnu.org; Tue, 02 Oct 2012 14:21:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TJ75s-00036E-AT
	for libtasn1-commit@gnu.org; Tue, 02 Oct 2012 14:21:31 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:53778)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TJ75s-000362-5r
	for libtasn1-commit@gnu.org; Tue, 02 Oct 2012 14:21:20 -0400
Received: from nmav by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TJ75r-0007gU-H9
	for libtasn1-commit@gnu.org; Tue, 02 Oct 2012 18:21:20 +0000
Date: Tue, 02 Oct 2012 18:21:19 +0000
Message-Id: <E1TJ75r-0007gU-H9@vcs.savannah.gnu.org>
From: "Nikos Mavrogiannopoulos" <nmav@gnutls.org>
To: libtasn1-commit@gnu.org
Subject: [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_13-44-gc2ad9af
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0e0068c42896c411420da4d03166d54ea32694ee
X-Git-Newrev: c2ad9af33c54676d111331b32480978d67b9d8ca
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libtasn1-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libtasn1 <libtasn1-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtasn1-commit>
List-Post: <mailto:libtasn1-commit@gnu.org>
List-Help: <mailto:libtasn1-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2012 18:21:35 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=c2ad9af33c54676d111331b32480978d67b9d8ca

The branch, master has been updated
       via  c2ad9af33c54676d111331b32480978d67b9d8ca (commit)
       via  663e96ae5bb3cc847b4208110a6fb8acbb8cf91f (commit)
       via  bb8628e071604d25b68cf3be2e22151b00ebbef5 (commit)
      from  0e0068c42896c411420da4d03166d54ea32694ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c2ad9af33c54676d111331b32480978d67b9d8ca
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Tue Oct 2 20:20:49 2012 +0200

    removed unneeded variables and files.

commit 663e96ae5bb3cc847b4208110a6fb8acbb8cf91f
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Tue Oct 2 20:17:46 2012 +0200

    Updated gllib and added hash-pjw-bare.

commit bb8628e071604d25b68cf3be2e22151b00ebbef5
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Tue Oct 2 20:11:01 2012 +0200

    Use hash-pjw-bare instead of asn1_bhash().

-----------------------------------------------------------------------

Summary of changes:
 lib/Makefile.am           |    3 +-
 lib/gllib/Makefile.am     |   14 ++--
 lib/gllib/dummy.c         |   42 --------
 lib/gllib/hash-pjw-bare.c |   42 ++++++++
 lib/gllib/hash-pjw-bare.h |   24 +++++
 lib/gllib/stdint.in.h     |    2 +-
 lib/glm4/extensions.m4    |    4 +-
 lib/glm4/gnulib-cache.m4  |    5 +-
 lib/glm4/gnulib-common.m4 |    4 +-
 lib/glm4/gnulib-comp.m4   |   28 +++---
 lib/glm4/multiarch.m4     |    4 +-
 lib/glm4/visibility.m4    |    4 +-
 lib/hash.c                |  235 ---------------------------------------------
 lib/int.h                 |    1 -
 lib/parser_aux.c          |   19 ++--
 15 files changed, 110 insertions(+), 321 deletions(-)
 delete mode 100644 lib/gllib/dummy.c
 create mode 100644 lib/gllib/hash-pjw-bare.c
 create mode 100644 lib/gllib/hash-pjw-bare.h
 delete mode 100644 lib/hash.c

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 03b49f5..044f72d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -44,8 +44,7 @@ libtasn1_la_SOURCES =	\
 	parser_aux.h	\
 	structure.c	\
 	structure.h	\
-	version.c	\
-	hash.c
+	version.c
 
 libtasn1_la_LIBADD = gllib/libgnu.la
 
diff --git a/lib/gllib/Makefile.am b/lib/gllib/Makefile.am
index 86fef38..519e32e 100644
--- a/lib/gllib/Makefile.am
+++ b/lib/gllib/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib/gllib --m4-base=lib/glm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=2 --no-conditional-dependencies --libtool --macro-prefix=lgl --no-vc-files lib-symbol-versions lib-symbol-visibility stdint strverscmp
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib/gllib --m4-base=lib/glm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=2 --no-conditional-dependencies --libtool --macro-prefix=lgl --no-vc-files hash-pjw-bare lib-symbol-versions lib-symbol-visibility stdint strverscmp
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
@@ -50,6 +50,12 @@ EXTRA_libgnu_la_SOURCES =
 libgnu_la_LDFLAGS = $(AM_LDFLAGS)
 libgnu_la_LDFLAGS += -no-undefined
 
+## begin gnulib module hash-pjw-bare
+
+libgnu_la_SOURCES += hash-pjw-bare.h hash-pjw-bare.c
+
+## end   gnulib module hash-pjw-bare
+
 ## begin gnulib module lib-symbol-visibility
 
 # The value of $(CFLAG_VISIBILITY) needs to be added to the CFLAGS for the
@@ -318,12 +324,6 @@ EXTRA_libgnu_la_SOURCES += strverscmp.c
 
 ## end   gnulib module strverscmp
 
-## begin gnulib module dummy
-
-libgnu_la_SOURCES += dummy.c
-
-## end   gnulib module dummy
-
 
 mostlyclean-local: mostlyclean-generic
 	@for dir in '' $(MOSTLYCLEANDIRS); do \
diff --git a/lib/gllib/dummy.c b/lib/gllib/dummy.c
deleted file mode 100644
index ea1f46f..0000000
--- a/lib/gllib/dummy.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* A dummy file, to prevent empty libraries from breaking builds.
-   Copyright (C) 2004, 2007, 2009-2012 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* Some systems, reportedly OpenBSD and Mac OS X, refuse to create
-   libraries without any object files.  You might get an error like:
-
-   > ar cru .libs/libgl.a
-   > ar: no archive members specified
-
-   Compiling this file, and adding its object file to the library, will
-   prevent the library from being empty.  */
-
-/* Some systems, such as Solaris with cc 5.0, refuse to work with libraries
-   that don't export any symbol.  You might get an error like:
-
-   > cc ... libgnu.a
-   > ild: (bad file) garbled symbol table in archive ../gllib/libgnu.a
-
-   Compiling this file, and adding its object file to the library, will
-   prevent the library from exporting no symbols.  */
-
-#ifdef __sun
-/* This declaration ensures that the library will export at least 1 symbol.  */
-int gl_dummy_symbol;
-#else
-/* This declaration is solely to ensure that after preprocessing
-   this file is never empty.  */
-typedef int dummy;
-#endif
diff --git a/lib/gllib/hash-pjw-bare.c b/lib/gllib/hash-pjw-bare.c
new file mode 100644
index 0000000..92101e3
--- /dev/null
+++ b/lib/gllib/hash-pjw-bare.c
@@ -0,0 +1,42 @@
+/* hash-pjw-bare.c -- compute a hash value from a provided buffer.
+
+   Copyright (C) 2012 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#include "hash-pjw-bare.h"
+
+#include <limits.h>
+
+#define SIZE_BITS (sizeof (size_t) * CHAR_BIT)
+
+/* Return a hash of the N bytes of X using the method described by
+   Bruno Haible in http://www.haible.de/bruno/hashfunc.html.
+   Note that while many hash functions reduce their result via modulo
+   to a 0..table_size-1 range, this function does not do that.  */
+
+size_t
+hash_pjw_bare (const void *x, size_t n)
+{
+  const unsigned char *s = x;
+  size_t h = 0;
+  unsigned i;
+
+  for (i = 0; i < n; i++)
+    h = s[i] + ((h << 9) | (h >> (SIZE_BITS - 9)));
+
+  return h;
+}
diff --git a/lib/gllib/hash-pjw-bare.h b/lib/gllib/hash-pjw-bare.h
new file mode 100644
index 0000000..60852d1
--- /dev/null
+++ b/lib/gllib/hash-pjw-bare.h
@@ -0,0 +1,24 @@
+/* hash-pjw-bare.h -- declaration for a simple hash function
+   Copyright (C) 2012 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2.1 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include <stddef.h>
+
+/* Compute a hash code for a buffer starting at X and of size N,
+   and return the hash code.  Note that unlike hash_pjw(), it does not
+   return it modulo a table size.
+   The result is platform dependent: it depends on the size of the 'size_t'
+   type and on the signedness of the 'char' type.  */
+extern size_t hash_pjw_bare (const void *x, size_t n) _GL_ATTRIBUTE_PURE;
diff --git a/lib/gllib/stdint.in.h b/lib/gllib/stdint.in.h
index 3475dbe..4f61f95 100644
--- a/lib/gllib/stdint.in.h
+++ b/lib/gllib/stdint.in.h
@@ -83,7 +83,7 @@
 /* <sys/types.h> defines some of the stdint.h types as well, on glibc,
    IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
    AIX 5.2 <sys/types.h> isn't needed and causes troubles.
-   MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+   Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
    relies on the system <stdint.h> definitions, so include
    <sys/types.h> after @NEXT_STDINT_H@.  */
 #if @HAVE_SYS_TYPES_H@ && ! defined _AIX
diff --git a/lib/glm4/extensions.m4 b/lib/glm4/extensions.m4
index 0bfaef6..6d17d8a 100644
--- a/lib/glm4/extensions.m4
+++ b/lib/glm4/extensions.m4
@@ -1,4 +1,4 @@
-# serial 11  -*- Autoconf -*-
+# serial 12  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
 # Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
@@ -67,7 +67,7 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on MacOS X.  */
+/* Enable general extensions on Mac OS X.  */
 #ifndef _DARWIN_C_SOURCE
 # undef _DARWIN_C_SOURCE
 #endif
diff --git a/lib/glm4/gnulib-cache.m4 b/lib/glm4/gnulib-cache.m4
index d0e6acb..1037f83 100644
--- a/lib/glm4/gnulib-cache.m4
+++ b/lib/glm4/gnulib-cache.m4
@@ -27,11 +27,12 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib/gllib --m4-base=lib/glm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=2 --no-conditional-dependencies --libtool --macro-prefix=lgl --no-vc-files lib-symbol-versions lib-symbol-visibility stdint strverscmp
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib/gllib --m4-base=lib/glm4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=2 --no-conditional-dependencies --libtool --macro-prefix=lgl --no-vc-files hash-pjw-bare lib-symbol-versions lib-symbol-visibility stdint strverscmp
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
 gl_MODULES([
+  hash-pjw-bare
   lib-symbol-versions
   lib-symbol-visibility
   stdint
@@ -49,5 +50,5 @@ gl_MAKEFILE_NAME([])
 gl_LIBTOOL
 gl_MACRO_PREFIX([lgl])
 gl_PO_DOMAIN([])
-gl_WITNESS_C_DOMAIN([])
+gl_WITNESS_C_MACRO([])
 gl_VC_FILES([false])
diff --git a/lib/glm4/gnulib-common.m4 b/lib/glm4/gnulib-common.m4
index d62b767..15d2b2b 100644
--- a/lib/glm4/gnulib-common.m4
+++ b/lib/glm4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 32
+# gnulib-common.m4 serial 33
 dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -30,7 +30,7 @@ AC_DEFUN([gl_COMMON_BODY], [
 [/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
    the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
    earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-   __APPLE__ && __MACH__ test for MacOS X.
+   __APPLE__ && __MACH__ test for Mac OS X.
    __APPLE_CC__ tests for the Apple compiler and its version.
    __STDC_VERSION__ tests for the C99 mode.  */
 #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
diff --git a/lib/glm4/gnulib-comp.m4 b/lib/glm4/gnulib-comp.m4
index b1d2854..6badef8 100644
--- a/lib/glm4/gnulib-comp.m4
+++ b/lib/glm4/gnulib-comp.m4
@@ -40,6 +40,7 @@ AC_DEFUN([lgl_EARLY],
   AC_REQUIRE([gl_PROG_AR_RANLIB])
   # Code from module extensions:
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  # Code from module hash-pjw-bare:
   # Code from module include_next:
   # Code from module lib-symbol-versions:
   # Code from module lib-symbol-visibility:
@@ -67,18 +68,18 @@ AC_DEFUN([lgl_INIT],
   m4_pushdef([lgl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='lib/gllib'
-gl_LD_VERSION_SCRIPT
-gl_VISIBILITY
-gl_MULTIARCH
-gl_STDDEF_H
-gl_STDINT_H
-gl_HEADER_STRING_H
-gl_FUNC_STRVERSCMP
-if test $HAVE_STRVERSCMP = 0; then
-  AC_LIBOBJ([strverscmp])
-  gl_PREREQ_STRVERSCMP
-fi
-gl_STRING_MODULE_INDICATOR([strverscmp])
+  gl_LD_VERSION_SCRIPT
+  gl_VISIBILITY
+  gl_MULTIARCH
+  gl_STDDEF_H
+  gl_STDINT_H
+  gl_HEADER_STRING_H
+  gl_FUNC_STRVERSCMP
+  if test $HAVE_STRVERSCMP = 0; then
+    AC_LIBOBJ([strverscmp])
+    gl_PREREQ_STRVERSCMP
+  fi
+  gl_STRING_MODULE_INDICATOR([strverscmp])
   # End of code from modules
   m4_ifval(lgl_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([lgl_LIBSOURCES_DIR])[ ||
@@ -218,7 +219,8 @@ AC_DEFUN([lgl_FILE_LIST], [
   build-aux/snippet/arg-nonnull.h
   build-aux/snippet/c++defs.h
   build-aux/snippet/warn-on-use.h
-  lib/dummy.c
+  lib/hash-pjw-bare.c
+  lib/hash-pjw-bare.h
   lib/stddef.in.h
   lib/stdint.in.h
   lib/string.in.h
diff --git a/lib/glm4/multiarch.m4 b/lib/glm4/multiarch.m4
index b424dce..0c288b8 100644
--- a/lib/glm4/multiarch.m4
+++ b/lib/glm4/multiarch.m4
@@ -1,4 +1,4 @@
-# multiarch.m4 serial 6
+# multiarch.m4 serial 7
 dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved.
 
 # Determine whether the compiler is or may be producing universal binaries.
 #
-# On MacOS X 10.5 and later systems, the user can create libraries and
+# On Mac OS X 10.5 and later systems, the user can create libraries and
 # executables that work on multiple system types--known as "fat" or
 # "universal" binaries--by specifying multiple '-arch' options to the
 # compiler but only a single '-arch' option to the preprocessor.  Like
diff --git a/lib/glm4/visibility.m4 b/lib/glm4/visibility.m4
index 7b24d39..a7d4d8c 100644
--- a/lib/glm4/visibility.m4
+++ b/lib/glm4/visibility.m4
@@ -1,4 +1,4 @@
-# visibility.m4 serial 4 (gettext-0.18.2)
+# visibility.m4 serial 5 (gettext-0.18.2)
 dnl Copyright (C) 2005, 2008, 2010-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -12,7 +12,7 @@ dnl __attribute__((__visibility__("hidden"))) and
 dnl __attribute__((__visibility__("default"))).
 dnl Does *not* test for __visibility__("protected") - which has tricky
 dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
-dnl MacOS X.
+dnl Mac OS X.
 dnl Does *not* test for __visibility__("internal") - which has processor
 dnl dependent semantics.
 dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
diff --git a/lib/hash.c b/lib/hash.c
deleted file mode 100644
index 50da70c..0000000
--- a/lib/hash.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (C) 2011-2012 Free Software Foundation, Inc.
- *
- * Author: Nikos Mavrogiannopoulos
- *
- * This file is part of GnuTLS.
- *
- * The GnuTLS is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-#include <int.h>
-
-#define INIT_VAL 0x33a1
-/*
--------------------------------------------------------------------------------
-lookup3.c, by Bob Jenkins, May 2006, Public Domain.
-
-These are functions for producing 32-bit hashes for hash table lookup.
-hashword(), hashlittle(), hashlittle2(), hashbig(), mix(), and final() 
-are externally useful functions.  Routines to test the hash are included 
-if SELF_TEST is defined.  You can use this free for any purpose.  It's in
-the public domain.  It has no warranty.
-
-You probably want to use hashlittle().  hashlittle() and hashbig()
-hash byte arrays.  hashlittle() is faster than hashbig() on
-little-endian machines.  Intel and AMD are little-endian machines.
-On second thought, you probably want hashlittle2(), which is identical to
-hashlittle() except it returns two 32-bit hashes for the price of one.  
-You could implement hashbig2() if you wanted but I haven't bothered here.
-
-If you want to find a hash of, say, exactly 7 integers, do
-  a = i1;  b = i2;  c = i3;
-  mix(a,b,c);
-  a += i4; b += i5; c += i6;
-  mix(a,b,c);
-  a += i7;
-  final(a,b,c);
-then use c as the hash value.  If you have a variable length array of
-4-byte integers to hash, use hashword().  If you have a byte array (like
-a character string), use hashlittle().  If you have several byte arrays, or
-a mix of things, see the comments above hashlittle().  
-
-Why is this so big?  I read 12 bytes at a time into 3 4-byte integers, 
-then mix those integers.  This is fast (you can do a lot more thorough
-mixing with 12*3 instructions on 3 integers than you can with 3 instructions
-on 1 byte), but shoehorning those bytes into integers efficiently is messy.
--------------------------------------------------------------------------------
-*/
-#define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
-
-/*
--------------------------------------------------------------------------------
-mix -- mix 3 32-bit values reversibly.
-
-This is reversible, so any information in (a,b,c) before mix() is
-still in (a,b,c) after mix().
-
-If four pairs of (a,b,c) inputs are run through mix(), or through
-mix() in reverse, there are at least 32 bits of the output that
-are sometimes the same for one pair and different for another pair.
-This was tested for:
-* pairs that differed by one bit, by two bits, in any combination
-  of top bits of (a,b,c), or in any combination of bottom bits of
-  (a,b,c).
-* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
-  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-  is commonly produced by subtraction) look like a single 1-bit
-  difference.
-* the base values were pseudorandom, all zero but one bit set, or 
-  all zero plus a counter that starts at zero.
-
-Some k values for my "a-=c; a^=rot(c,k); c+=b;" arrangement that
-satisfy this are
-    4  6  8 16 19  4
-    9 15  3 18 27 15
-   14  9  3  7 17  3
-Well, "9 15 3 18 27 15" didn't quite get 32 bits diffing
-for "differ" defined as + with a one-bit base and a two-bit delta.  I
-used http://burtleburtle.net/bob/hash/avalanche.html to choose 
-the operations, constants, and arrangements of the variables.
-
-This does not achieve avalanche.  There are input bits of (a,b,c)
-that fail to affect some output bits of (a,b,c), especially of a.  The
-most thoroughly mixed value is c, but it doesn't really even achieve
-avalanche in c.
-
-This allows some parallelism.  Read-after-writes are good at doubling
-the number of bits affected, so the goal of mixing pulls in the opposite
-direction as the goal of parallelism.  I did what I could.  Rotates
-seem to cost as much as shifts on every machine I could lay my hands
-on, and rotates are much kinder to the top and bottom bits, so I used
-rotates.
--------------------------------------------------------------------------------
-*/
-#define mix(a,b,c) \
-{ \
-  a -= c;  a ^= rot(c, 4);  c += b; \
-  b -= a;  b ^= rot(a, 6);  a += c; \
-  c -= b;  c ^= rot(b, 8);  b += a; \
-  a -= c;  a ^= rot(c,16);  c += b; \
-  b -= a;  b ^= rot(a,19);  a += c; \
-  c -= b;  c ^= rot(b, 4);  b += a; \
-}
-
-/*
--------------------------------------------------------------------------------
-final -- final mixing of 3 32-bit values (a,b,c) into c
-
-Pairs of (a,b,c) values differing in only a few bits will usually
-produce values of c that look totally different.  This was tested for
-* pairs that differed by one bit, by two bits, in any combination
-  of top bits of (a,b,c), or in any combination of bottom bits of
-  (a,b,c).
-* "differ" is defined as +, -, ^, or ~^.  For + and -, I transformed
-  the output delta to a Gray code (a^(a>>1)) so a string of 1's (as
-  is commonly produced by subtraction) look like a single 1-bit
-  difference.
-* the base values were pseudorandom, all zero but one bit set, or 
-  all zero plus a counter that starts at zero.
-
-These constants passed:
- 14 11 25 16 4 14 24
- 12 14 25 16 4 14 24
-and these came close:
-  4  8 15 26 3 22 24
- 10  8 15 26 3 22 24
- 11  8 15 26 3 22 24
--------------------------------------------------------------------------------
-*/
-#define final(a,b,c) \
-{ \
-  c ^= b; c -= rot(b,14); \
-  a ^= c; a -= rot(c,11); \
-  b ^= a; b -= rot(a,25); \
-  c ^= b; c -= rot(b,16); \
-  a ^= c; a -= rot(c,4);  \
-  b ^= a; b -= rot(a,14); \
-  c ^= b; c -= rot(b,24); \
-}
-
-
-/*
--------------------------------------------------------------------------------
-hashlittle() -- hash a variable-length key into a 32-bit value
-  k       : the key (the unaligned variable-length array of bytes)
-  length  : the length of the key, counting by bytes
-  initval : can be any 4-byte value
-Returns a 32-bit value.  Every bit of the key affects every bit of
-the return value.  Two keys differing by one or two bits will have
-totally different hash values.
-
-The best hash table sizes are powers of 2.  There is no need to do
-mod a prime (mod is sooo slow!).  If you need less than 32 bits,
-use a bitmask.  For example, if you need only 10 bits, do
-  h = (h & hashmask(10));
-In which case, the hash table should have hashsize(10) elements.
-
-If you are hashing n strings (uint8_t **)k, do it like this:
-  for (i=0, h=0; i<n; ++i) h = hashlittle( k[i], len[i], h);
-
-By Bob Jenkins, 2006.  bob_jenkins@burtleburtle.net.  You may use this
-code any way you wish, private, educational, or commercial.  It's free.
-
-Use for hash table lookup, or anything where one collision in 2^^32 is
-acceptable.  Do NOT use for cryptographic purposes.
--------------------------------------------------------------------------------
-*/
-
-uint32_t _asn1_bhash( const void *key, size_t length)
-{
-  uint32_t a,b,c;                                          /* internal state */
-  const uint8_t *k;
-
-  /* Set up the internal state */
-  a = b = c = 0xdeadbeef + ((uint32_t)length) + INIT_VAL;
-
-  k = (const uint8_t *)key;
-
-  /*--------------- all but the last block: affect some 32 bits of (a,b,c) */
-  while (length > 12)
-  {
-    a += k[0];
-    a += ((uint32_t)k[1])<<8;
-    a += ((uint32_t)k[2])<<16;
-    a += ((uint32_t)k[3])<<24;
-    b += k[4];
-    b += ((uint32_t)k[5])<<8;
-    b += ((uint32_t)k[6])<<16;
-    b += ((uint32_t)k[7])<<24;
-    c += k[8];
-    c += ((uint32_t)k[9])<<8;
-    c += ((uint32_t)k[10])<<16;
-    c += ((uint32_t)k[11])<<24;
-    mix(a,b,c);
-    length -= 12;
-    k += 12;
-  }
-
-  /*-------------------------------- last block: affect all 32 bits of (c) */
-  switch(length)                   /* all the case statements fall through */
-  {
-    case 12: c+=((uint32_t)k[11])<<24;
-    case 11: c+=((uint32_t)k[10])<<16;
-    case 10: c+=((uint32_t)k[9])<<8;
-    case 9 : c+=k[8];
-    case 8 : b+=((uint32_t)k[7])<<24;
-    case 7 : b+=((uint32_t)k[6])<<16;
-    case 6 : b+=((uint32_t)k[5])<<8;
-    case 5 : b+=k[4];
-    case 4 : a+=((uint32_t)k[3])<<24;
-    case 3 : a+=((uint32_t)k[2])<<16;
-    case 2 : a+=((uint32_t)k[1])<<8;
-    case 1 : a+=k[0];
-             break;
-    case 0 : return c;
-  }
-
-  final(a,b,c);
-  return c;
-}
-
-
-
diff --git a/lib/int.h b/lib/int.h
index 6643ffb..66d8a5c 100644
--- a/lib/int.h
+++ b/lib/int.h
@@ -64,7 +64,6 @@ struct asn_node_st
 #define _asn1_strcmp(a,b) strcmp((const char *)a, (const char *)b)
 #define _asn1_strcpy(a,b) strcpy((char *)a, (const char *)b)
 #define _asn1_strcat(a,b) strcat((char *)a, (const char *)b)
-uint32_t _asn1_bhash( const void *key, size_t length);
 
 #define MAX_LOG_SIZE 1024	/* maximum number of characters of a log message */
 
diff --git a/lib/parser_aux.c b/lib/parser_aux.c
index b52ad89..c9a1801 100644
--- a/lib/parser_aux.c
+++ b/lib/parser_aux.c
@@ -20,6 +20,7 @@
  */
 
 #include <int.h>
+#include <hash-pjw-bare.h>
 #include "parser_aux.h"
 #include "gstr.h"
 #include "structure.h"
@@ -118,12 +119,12 @@ asn1_find_node (asn_node_t pointer, const char *name)
 	  n_start = n_end;
 	  n_start++;
 
-          nhash = _asn1_bhash(n, nsize);
+          nhash = hash_pjw_bare(n, nsize);
 	}
       else
 	{
 	  nsize = _asn1_str_cpy (n, sizeof (n), n_start);
-          nhash = _asn1_bhash(n, nsize);
+          nhash = hash_pjw_bare(n, nsize);
 
 	  n_start = NULL;
 	}
@@ -156,12 +157,12 @@ asn1_find_node (asn_node_t pointer, const char *name)
 	  n_start = n_end;
 	  n_start++;
 
-          nhash = _asn1_bhash(n, nsize);
+          nhash = hash_pjw_bare(n, nsize);
 	}
       else
 	{
 	  nsize = _asn1_str_cpy (n, sizeof (n), n_start);
-          nhash = _asn1_bhash(n, nsize);
+          nhash = hash_pjw_bare(n, nsize);
 	  n_start = NULL;
 	}
 
@@ -365,12 +366,12 @@ unsigned int nsize;
   if (name == NULL)
     {
       node->name[0] = 0;
-      node->name_hash = _asn1_bhash(node->name, 0);
+      node->name_hash = hash_pjw_bare(node->name, 0);
       return node;
     }
 
   nsize = _asn1_str_cpy (node->name, sizeof (node->name), name);
-  node->name_hash = _asn1_bhash(node->name, nsize);
+  node->name_hash = hash_pjw_bare(node->name, nsize);
 
   return node;
 }
@@ -386,19 +387,17 @@ unsigned int nsize;
 asn_node_t
 _asn1_cpy_name (asn_node_t dst, asn_node_t src)
 {
-unsigned int nsize;
-
   if (dst == NULL)
     return dst;
 
   if (src == NULL)
     {
       dst->name[0] = 0;
-      dst->name_hash = _asn1_bhash(dst->name, 0);
+      dst->name_hash = hash_pjw_bare(dst->name, 0);
       return dst;
     }
 
-  nsize = _asn1_str_cpy (dst->name, sizeof (dst->name), src->name);
+  _asn1_str_cpy (dst->name, sizeof (dst->name), src->name);
   dst->name_hash = src->name_hash;
 
   return dst;


hooks/post-receive
-- 
GNU libtasn1


From MAILER-DAEMON Thu Oct 04 13:41:46 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TJpQg-00040p-HW
	for mharc-libtasn1-commit@gnu.org; Thu, 04 Oct 2012 13:41:46 -0400
Received: from eggs.gnu.org ([208.118.235.92]:55831)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TJpQZ-0003zI-DS
	for libtasn1-commit@gnu.org; Thu, 04 Oct 2012 13:41:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TJpQY-0004ZZ-2A
	for libtasn1-commit@gnu.org; Thu, 04 Oct 2012 13:41:39 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:33176)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TJpQX-0004ZV-VP
	for libtasn1-commit@gnu.org; Thu, 04 Oct 2012 13:41:37 -0400
Received: from nmav by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TJpQX-0003Fa-Bx
	for libtasn1-commit@gnu.org; Thu, 04 Oct 2012 17:41:37 +0000
Date: Thu, 04 Oct 2012 17:41:37 +0000
Message-Id: <E1TJpQX-0003Fa-Bx@vcs.savannah.gnu.org>
From: "Nikos Mavrogiannopoulos" <nmav@gnutls.org>
To: libtasn1-commit@gnu.org
Subject: [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_13-45-g6704bb1
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c2ad9af33c54676d111331b32480978d67b9d8ca
X-Git-Newrev: 6704bb1e91e28be6f46e6948c82de16604d765b0
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libtasn1-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libtasn1 <libtasn1-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtasn1-commit>
List-Post: <mailto:libtasn1-commit@gnu.org>
List-Help: <mailto:libtasn1-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Oct 2012 17:41:45 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=6704bb1e91e28be6f46e6948c82de16604d765b0

The branch, master has been updated
       via  6704bb1e91e28be6f46e6948c82de16604d765b0 (commit)
      from  c2ad9af33c54676d111331b32480978d67b9d8ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6704bb1e91e28be6f46e6948c82de16604d765b0
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Thu Oct 4 19:40:53 2012 +0200

    updated

-----------------------------------------------------------------------

Summary of changes:
 NEWS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index ad700d8..1b9c4ca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 GNU Libtasn1 NEWS                                     -*- outline -*-
 
 * Noteworthy changes in release 3.0 (unreleased) [stable]
+- Added tool in tests/ to benchmark X.509 structure decoding.
 - Added asn1_read_node_value() to obtain a node's value.
 - Optimizations in internal tree allocation.
 - Optimizations in tree search.


hooks/post-receive
-- 
GNU libtasn1


From MAILER-DAEMON Sat Oct 06 08:24:33 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TKTQn-0002kR-8N
	for mharc-libtasn1-commit@gnu.org; Sat, 06 Oct 2012 08:24:33 -0400
Received: from eggs.gnu.org ([208.118.235.92]:38094)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TKTQl-0002k6-2S
	for libtasn1-commit@gnu.org; Sat, 06 Oct 2012 08:24:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TKTQj-0006Ox-S3
	for libtasn1-commit@gnu.org; Sat, 06 Oct 2012 08:24:31 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:54651)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TKTQj-0006Ol-ON
	for libtasn1-commit@gnu.org; Sat, 06 Oct 2012 08:24:29 -0400
Received: from nmav by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TKTQj-00011t-9G
	for libtasn1-commit@gnu.org; Sat, 06 Oct 2012 12:24:29 +0000
Date: Sat, 06 Oct 2012 12:24:29 +0000
Message-Id: <E1TKTQj-00011t-9G@vcs.savannah.gnu.org>
From: "Nikos Mavrogiannopoulos" <nmav@gnutls.org>
To: libtasn1-commit@gnu.org
Subject: [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_13-46-g40e7731
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6704bb1e91e28be6f46e6948c82de16604d765b0
X-Git-Newrev: 40e7731b1ff6b250744b76216945308dc7146213
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libtasn1-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libtasn1 <libtasn1-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtasn1-commit>
List-Post: <mailto:libtasn1-commit@gnu.org>
List-Help: <mailto:libtasn1-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2012 12:24:32 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=40e7731b1ff6b250744b76216945308dc7146213

The branch, master has been updated
       via  40e7731b1ff6b250744b76216945308dc7146213 (commit)
      from  6704bb1e91e28be6f46e6948c82de16604d765b0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 40e7731b1ff6b250744b76216945308dc7146213
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Sat Oct 6 14:05:43 2012 +0200

    Set the error description to null initialy.

-----------------------------------------------------------------------

Summary of changes:
 lib/decoding.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/lib/decoding.c b/lib/decoding.c
index df86f85..3714979 100644
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -833,6 +833,9 @@ asn1_der_decoding (asn_node_t * element, const void *ider, int len,
 
   node = *element;
 
+  if (errorDescription != NULL)
+    errorDescription[0] = 0;
+
   if (node == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
 


hooks/post-receive
-- 
GNU libtasn1


From MAILER-DAEMON Sat Oct 06 09:12:41 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TKTX9-0005cI-9c
	for mharc-libtasn1-commit@gnu.org; Sat, 06 Oct 2012 08:31:07 -0400
Received: from eggs.gnu.org ([208.118.235.92]:49819)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TKTWx-000586-R0
	for libtasn1-commit@gnu.org; Sat, 06 Oct 2012 08:31:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TKTWs-0000T7-F8
	for libtasn1-commit@gnu.org; Sat, 06 Oct 2012 08:30:55 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:46647)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TKTWs-0000SV-7C
	for libtasn1-commit@gnu.org; Sat, 06 Oct 2012 08:30:50 -0400
Received: from nmav by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TKTWr-0001ZJ-Sf
	for libtasn1-commit@gnu.org; Sat, 06 Oct 2012 12:30:50 +0000
Date: Sat, 06 Oct 2012 12:30:49 +0000
Message-Id: <E1TKTWr-0001ZJ-Sf@vcs.savannah.gnu.org>
From: "Nikos Mavrogiannopoulos" <nmav@gnutls.org>
To: libtasn1-commit@gnu.org
Subject: [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_13-47-g22dd880
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 40e7731b1ff6b250744b76216945308dc7146213
X-Git-Newrev: 22dd88046a752020c9b7aec5710231da92cdbeb7
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libtasn1-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libtasn1 <libtasn1-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtasn1-commit>
List-Post: <mailto:libtasn1-commit@gnu.org>
List-Help: <mailto:libtasn1-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2012 12:31:04 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=22dd88046a752020c9b7aec5710231da92cdbeb7

The branch, master has been updated
       via  22dd88046a752020c9b7aec5710231da92cdbeb7 (commit)
      from  40e7731b1ff6b250744b76216945308dc7146213 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 22dd88046a752020c9b7aec5710231da92cdbeb7
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Sat Oct 6 14:29:37 2012 +0200

    asn_ -> asn1_

-----------------------------------------------------------------------

Summary of changes:
 NEWS                       |   12 +++---
 doc/libtasn1.texi          |    6 ++--
 lib/ASN1.c                 |    6 ++--
 lib/ASN1.y                 |    6 ++--
 lib/coding.c               |   22 ++++++------
 lib/decoding.c             |   38 +++++++++++-----------
 lib/element.c              |   26 +++++++-------
 lib/element.h              |    4 +-
 lib/int.h                  |   14 ++++----
 lib/libtasn1.h             |   76 +++++++++++++++++++++---------------------
 lib/parser_aux.c           |   76 +++++++++++++++++++++---------------------
 lib/parser_aux.h           |   56 ++++++++++++++++----------------
 lib/structure.c            |   78 ++++++++++++++++++++++----------------------
 lib/structure.h            |    8 ++--
 src/asn1Coding.c           |    4 +-
 src/asn1Decoding.c         |   10 +++---
 src/asn1Parser.c           |    2 +-
 tests/Test_encoding.c      |    4 +-
 tests/Test_indefinite.c    |    4 +-
 tests/Test_parser.c        |    2 +-
 tests/Test_tree.c          |    4 +-
 tests/Test_tree_asn1_tab.c |    2 +-
 22 files changed, 230 insertions(+), 230 deletions(-)

diff --git a/NEWS b/NEWS
index 1b9c4ca..dc04286 100644
--- a/NEWS
+++ b/NEWS
@@ -7,13 +7,13 @@ GNU Libtasn1 NEWS                                     -*- outline -*-
 - Optimizations in tree search.
 - libtasn1.h no longer exports internal structures.
 - Types were renamed for consistency:
-  ASN1_DATA_NODE -> asn_data_node_st
-  ASN1_ARRAY_TYPE -> asn_static_node_t
-  ASN1_TYPE -> asn_node_t
+  ASN1_DATA_NODE -> asn1_data_node_st
+  ASN1_ARRAY_TYPE -> asn1_static_node_t
+  ASN1_TYPE -> asn1_node_t
   ASN1_TYPE_EMPTY -> NULL
-  static_struct_asn -> asn_static_node_st
-  node_asn_struct -> asn_node_st
-  node_asn -> asn_node_st
+  static_struct_asn -> asn1_static_node_st
+  node_asn_struct -> asn1_node_st
+  node_asn -> asn1_node_st
   (the old types are still available as definitions)
 
 * Noteworthy changes in release 2.13 (2012-05-31) [stable]
diff --git a/doc/libtasn1.texi b/doc/libtasn1.texi
index fc88b25..3268914 100644
--- a/doc/libtasn1.texi
+++ b/doc/libtasn1.texi
@@ -229,16 +229,16 @@ The name "?LAST" indicates the last element of a @code{SET_OF} or
 
 The header file of this library is @file{libtasn1.h}.
 
-@cindex Main type asn_node_t
+@cindex Main type asn1_node_t
 
-The main type used in it is @code{asn_node_t}, and it's used to store
+The main type used in it is @code{asn1_node_t}, and it's used to store
 the ASN.1 definitions and structures (instances).
 
 The constant @code{NULL} can be used for the variable
 initialization.  For example:
 
 @example
- asn_node_t definitions=NULL;
+ asn1_node_t definitions=NULL;
 @end example
 
 Some functions require a parameter named errorDescription of char*
diff --git a/lib/ASN1.c b/lib/ASN1.c
index 8a73052..48da82f 100644
--- a/lib/ASN1.c
+++ b/lib/ASN1.c
@@ -111,7 +111,7 @@
 static FILE *file_asn1;			/* Pointer to file to parse */
 static int result_parse;	/* result of the parser
 					   algorithm */
-static asn_node_t p_tree;		/* pointer to the root of the
+static asn1_node_t p_tree;		/* pointer to the root of the
 					   structure created by the
 					   parser*/
 static unsigned long lineNumber;	/* line number describing the
@@ -248,7 +248,7 @@ typedef union YYSTYPE
 
   unsigned int constant;
   char str[ASN1_MAX_NAME_SIZE+1];
-  asn_node_t node;
+  asn1_node_t node;
 
 
 
@@ -2810,7 +2810,7 @@ _asn1_create_errorDescription(int error,char *errorDescription)
  *   characters.
  **/
 int
-asn1_parser2tree(const char *file_name, asn_node_t *definitions,
+asn1_parser2tree(const char *file_name, asn1_node_t *definitions,
 		 char *errorDescription) 
 {
 
diff --git a/lib/ASN1.y b/lib/ASN1.y
index 68515cf..66df21a 100644
--- a/lib/ASN1.y
+++ b/lib/ASN1.y
@@ -34,7 +34,7 @@
 static FILE *file_asn1;			/* Pointer to file to parse */
 static int result_parse;	/* result of the parser
 					   algorithm */
-static asn_node_t p_tree;		/* pointer to the root of the
+static asn1_node_t p_tree;		/* pointer to the root of the
 					   structure created by the
 					   parser*/
 static unsigned long lineNumber;	/* line number describing the
@@ -57,7 +57,7 @@ static int _asn1_yylex(void);
 %union {
   unsigned int constant;
   char str[ASN1_MAX_NAME_SIZE+1];
-  asn_node_t node;
+  asn1_node_t node;
 }
 
 
@@ -576,7 +576,7 @@ _asn1_create_errorDescription(int error,char *errorDescription)
  *   characters.
  **/
 int
-asn1_parser2tree(const char *file_name, asn_node_t *definitions,
+asn1_parser2tree(const char *file_name, asn1_node_t *definitions,
 		 char *errorDescription) 
 {
 
diff --git a/lib/coding.c b/lib/coding.c
index 0a0a1e6..3cbcd8a 100644
--- a/lib/coding.c
+++ b/lib/coding.c
@@ -44,7 +44,7 @@
 /* Return:                                            */
 /******************************************************/
 static void
-_asn1_error_description_value_not_found (asn_node_t node,
+_asn1_error_description_value_not_found (asn1_node_t node,
 					 char *ErrorDescription)
 {
 
@@ -373,10 +373,10 @@ asn1_bit_der (const unsigned char *str, int bit_len,
 /*   otherwise ASN1_SUCCESS.                          */
 /******************************************************/
 static int
-_asn1_complete_explicit_tag (asn_node_t node, unsigned char *der,
+_asn1_complete_explicit_tag (asn1_node_t node, unsigned char *der,
 			     int *counter, int *max_len)
 {
-  asn_node_t p;
+  asn1_node_t p;
   int is_tag_implicit, len2, len3;
   unsigned char temp[SIZEOF_UNSIGNED_INT];
 
@@ -446,10 +446,10 @@ _asn1_complete_explicit_tag (asn_node_t node, unsigned char *der,
 /*   otherwise ASN1_SUCCESS.                          */
 /******************************************************/
 static int
-_asn1_insert_tag_der (asn_node_t node, unsigned char *der, int *counter,
+_asn1_insert_tag_der (asn1_node_t node, unsigned char *der, int *counter,
 		      int *max_len)
 {
-  asn_node_t p;
+  asn1_node_t p;
   int tag_len, is_tag_implicit;
   unsigned char class, class_implicit = 0, temp[SIZEOF_UNSIGNED_INT * 3 + 1];
   unsigned long tag_implicit = 0;
@@ -607,7 +607,7 @@ _asn1_insert_tag_der (asn_node_t node, unsigned char *der, int *counter,
 /* Return:                                            */
 /******************************************************/
 static void
-_asn1_ordering_set (unsigned char *der, int der_len, asn_node_t node)
+_asn1_ordering_set (unsigned char *der, int der_len, asn1_node_t node)
 {
   struct vet
   {
@@ -618,7 +618,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, asn_node_t node)
 
   int counter, len, len2;
   struct vet *first, *last, *p_vet, *p2_vet;
-  asn_node_t p;
+  asn1_node_t p;
   unsigned char class, *temp;
   unsigned long tag;
 
@@ -721,7 +721,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, asn_node_t node)
 /* Return:                                            */
 /******************************************************/
 static void
-_asn1_ordering_set_of (unsigned char *der, int der_len, asn_node_t node)
+_asn1_ordering_set_of (unsigned char *der, int der_len, asn1_node_t node)
 {
   struct vet
   {
@@ -731,7 +731,7 @@ _asn1_ordering_set_of (unsigned char *der, int der_len, asn_node_t node)
 
   int counter, len, len2, change;
   struct vet *first, *last, *p_vet, *p2_vet;
-  asn_node_t p;
+  asn1_node_t p;
   unsigned char *temp, class;
   unsigned long k, max;
 
@@ -867,10 +867,10 @@ _asn1_ordering_set_of (unsigned char *der, int der_len, asn_node_t node)
  *   length needed.
  **/
 int
-asn1_der_coding (asn_node_t element, const char *name, void *ider, int *len,
+asn1_der_coding (asn1_node_t element, const char *name, void *ider, int *len,
 		 char *ErrorDescription)
 {
-  asn_node_t node, p, p2;
+  asn1_node_t node, p, p2;
   unsigned char temp[SIZEOF_UNSIGNED_LONG_INT * 3 + 1];
   int counter, counter_old, len2, len3, tlen, move, max_len, max_len_old;
   int err;
diff --git a/lib/decoding.c b/lib/decoding.c
index 3714979..4373a1d 100644
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -36,7 +36,7 @@ static int
 _asn1_get_indefinite_length_string (const unsigned char *der, int *len);
 
 static void
-_asn1_error_description_tag_error (asn_node_t node, char *ErrorDescription)
+_asn1_error_description_tag_error (asn1_node_t node, char *ErrorDescription)
 {
 
   Estrcpy (ErrorDescription, ":: tag error near element '");
@@ -369,10 +369,10 @@ asn1_get_bit_der (const unsigned char *der, int der_len,
 }
 
 static int
-_asn1_extract_tag_der (asn_node_t node, const unsigned char *der, int der_len,
+_asn1_extract_tag_der (asn1_node_t node, const unsigned char *der, int der_len,
 		       int *ret_len)
 {
-  asn_node_t p;
+  asn1_node_t p;
   int counter, len2, len3, is_tag_implicit;
   unsigned long tag, tag_implicit = 0;
   unsigned char class, class2, class_implicit = 0;
@@ -567,9 +567,9 @@ _asn1_extract_tag_der (asn_node_t node, const unsigned char *der, int der_len,
 }
 
 static int
-_asn1_delete_not_used (asn_node_t node)
+_asn1_delete_not_used (asn1_node_t node)
 {
-  asn_node_t p, p2;
+  asn1_node_t p, p2;
 
   if (node == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
@@ -626,7 +626,7 @@ _asn1_delete_not_used (asn_node_t node)
 }
 
 static int
-_asn1_extract_der_octet (asn_node_t node, const unsigned char *der,
+_asn1_extract_der_octet (asn1_node_t node, const unsigned char *der,
 			 int der_len)
 {
   int len2, len3;
@@ -671,7 +671,7 @@ _asn1_extract_der_octet (asn_node_t node, const unsigned char *der,
 }
 
 static int
-_asn1_get_octet_string (const unsigned char *der, asn_node_t node, int *len)
+_asn1_get_octet_string (const unsigned char *der, asn1_node_t node, int *len)
 {
   int len2, len3, counter, tot_len, indefinite;
 
@@ -820,10 +820,10 @@ _asn1_get_indefinite_length_string (const unsigned char *der, int *len)
  *   name (*@ELEMENT deleted).
  **/
 int
-asn1_der_decoding (asn_node_t * element, const void *ider, int len,
+asn1_der_decoding (asn1_node_t * element, const void *ider, int len,
 		   char *errorDescription)
 {
-  asn_node_t node, p, p2, p3;
+  asn1_node_t node, p, p2, p3;
   char temp[128];
   int counter, len2, len3, len4, move, ris, tlen;
   unsigned char class;
@@ -1401,10 +1401,10 @@ cleanup:
  *   match the structure @structure (*ELEMENT deleted).
  **/
 int
-asn1_der_decoding_element (asn_node_t * structure, const char *elementName,
+asn1_der_decoding_element (asn1_node_t * structure, const char *elementName,
 			   const void *ider, int len, char *errorDescription)
 {
-  asn_node_t node, p, p2, p3, nodeFound = NULL;
+  asn1_node_t node, p, p2, p3, nodeFound = NULL;
   char temp[128], currentName[ASN1_MAX_NAME_SIZE * 10], *dot_p, *char_p;
   int nameLen = ASN1_MAX_NAME_SIZE * 10 - 1, state;
   int counter, len2, len3, len4, move, ris, tlen;
@@ -2210,15 +2210,15 @@ cleanup:
  * certificate.
  *
  * Returns: %ASN1_SUCCESS if DER encoding OK, %ASN1_ELEMENT_NOT_FOUND
- *   if ELEMENT is %asn_node_t EMPTY or @name_element is not a valid
+ *   if ELEMENT is %asn1_node_t EMPTY or @name_element is not a valid
  *   element, %ASN1_TAG_ERROR or %ASN1_DER_ERROR if the der encoding
  *   doesn't match the structure ELEMENT.
  **/
 int
-asn1_der_decoding_startEnd (asn_node_t element, const void *ider, int len,
+asn1_der_decoding_startEnd (asn1_node_t element, const void *ider, int len,
 			    const char *name_element, int *start, int *end)
 {
-  asn_node_t node, node_to_find, p, p2, p3;
+  asn1_node_t node, node_to_find, p, p2, p3;
   int counter, len2, len3, len4, move, ris;
   unsigned char class;
   unsigned long tag;
@@ -2566,13 +2566,13 @@ asn1_der_decoding_startEnd (asn_node_t element, const void *ider, int len,
  *   depending on DER decoding.
  **/
 int
-asn1_expand_any_defined_by (asn_node_t definitions, asn_node_t * element)
+asn1_expand_any_defined_by (asn1_node_t definitions, asn1_node_t * element)
 {
   char definitionsName[ASN1_MAX_NAME_SIZE], name[2 * ASN1_MAX_NAME_SIZE + 1],
     value[ASN1_MAX_NAME_SIZE];
   int retCode = ASN1_SUCCESS, result;
   int len, len2, len3;
-  asn_node_t p, p2, p3, aux = NULL;
+  asn1_node_t p, p2, p3, aux = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
 
   if ((definitions == NULL) || (*element == NULL))
@@ -2796,14 +2796,14 @@ asn1_expand_any_defined_by (asn_node_t definitions, asn_node_t * element)
  *   use for expansion, or other errors depending on DER decoding.
  **/
 int
-asn1_expand_octet_string (asn_node_t definitions, asn_node_t * element,
+asn1_expand_octet_string (asn1_node_t definitions, asn1_node_t * element,
 			  const char *octetName, const char *objectName)
 {
   char name[2 * ASN1_MAX_NAME_SIZE + 1], value[ASN1_MAX_NAME_SIZE];
   int retCode = ASN1_SUCCESS, result;
   int len, len2, len3;
-  asn_node_t p2, aux = NULL;
-  asn_node_t octetNode = NULL, objectNode = NULL;
+  asn1_node_t p2, aux = NULL;
+  asn1_node_t octetNode = NULL, objectNode = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
 
   if ((definitions == NULL) || (*element == NULL))
diff --git a/lib/element.c b/lib/element.c
index ee10478..6105620 100644
--- a/lib/element.c
+++ b/lib/element.c
@@ -34,9 +34,9 @@
 #include "element.h"
 
 void
-_asn1_hierarchical_name (asn_node_t node, char *name, int name_size)
+_asn1_hierarchical_name (asn1_node_t node, char *name, int name_size)
 {
-  asn_node_t p;
+  asn1_node_t p;
   char tmp_name[64];
 
   p = node;
@@ -127,9 +127,9 @@ _asn1_convert_integer (const unsigned char *value, unsigned char *value_out,
 
 
 int
-_asn1_append_sequence_set (asn_node_t node)
+_asn1_append_sequence_set (asn1_node_t node)
 {
-  asn_node_t p, p2;
+  asn1_node_t p, p2;
   char temp[10];
   long n;
 
@@ -268,10 +268,10 @@ _asn1_append_sequence_set (asn_node_t node)
  *   %ASN1_VALUE_NOT_VALID if @ivalue has a wrong format.
  **/
 int
-asn1_write_value (asn_node_t node_root, const char *name,
+asn1_write_value (asn1_node_t node_root, const char *name,
 		  const void *ivalue, int len)
 {
-  asn_node_t node, p, p2;
+  asn1_node_t node, p, p2;
   unsigned char *temp, *value_temp = NULL, *default_temp = NULL;
   int len2, k, k2, negative;
   size_t i;
@@ -694,9 +694,9 @@ asn1_write_value (asn_node_t node_root, const char *name,
  *   bytes needed.
  **/
 int
-asn1_read_value (asn_node_t root, const char *name, void *ivalue, int *len)
+asn1_read_value (asn1_node_t root, const char *name, void *ivalue, int *len)
 {
-  asn_node_t node, p, p2;
+  asn1_node_t node, p, p2;
   int len2, len3;
   int value_size = *len;
   unsigned char *value = ivalue;
@@ -872,10 +872,10 @@ asn1_read_value (asn_node_t root, const char *name, void *ivalue, int *len)
  *   @name is not a valid element.
  **/
 int
-asn1_read_tag (asn_node_t root, const char *name, int *tagValue,
+asn1_read_tag (asn1_node_t root, const char *name, int *tagValue,
 	       int *classValue)
 {
-  asn_node_t node, p, pTag;
+  asn1_node_t node, p, pTag;
 
   node = asn1_find_node (root, name);
   if (node == NULL)
@@ -974,14 +974,14 @@ asn1_read_tag (asn_node_t root, const char *name, int *tagValue,
 /**
  * asn1_read_node_value:
  * @node: pointer to a node.
- * @data: a point to a asn_data_node_st
+ * @data: a point to a asn1_data_node_st
  *
- * Returns the value a data node inside a asn_node_t structure.
+ * Returns the value a data node inside a asn1_node_t structure.
  * The data returned should be handled as constant values.
  *
  * Returns: %ASN1_SUCCESS if the node exists.
  **/
-int asn1_read_node_value (asn_node_t node, asn_data_node_st* data)
+int asn1_read_node_value (asn1_node_t node, asn1_data_node_st* data)
 {
   data->name = node->name;
   data->value = node->value;
diff --git a/lib/element.h b/lib/element.h
index d48f362..ee07837 100644
--- a/lib/element.h
+++ b/lib/element.h
@@ -23,12 +23,12 @@
 #define _ELEMENT_H
 
 
-int _asn1_append_sequence_set (asn_node_t node);
+int _asn1_append_sequence_set (asn1_node_t node);
 
 int _asn1_convert_integer (const unsigned char *value,
 				    unsigned char *value_out,
 				    int value_out_size, int *len);
 
-void _asn1_hierarchical_name (asn_node_t node, char *name, int name_size);
+void _asn1_hierarchical_name (asn1_node_t node, char *name, int name_size);
 
 #endif
diff --git a/lib/int.h b/lib/int.h
index 66d8a5c..696fb70 100644
--- a/lib/int.h
+++ b/lib/int.h
@@ -43,7 +43,7 @@
 /* This structure is also in libtasn1.h, but then contains less
    fields.  You cannot make any modifications to these first fields
    without breaking ABI.  */
-struct asn_node_st
+struct asn1_node_st
 {
   /* public fields: */
   char name[ASN1_MAX_NAME_SIZE+1];			/* Node name */
@@ -51,9 +51,9 @@ struct asn_node_st
   unsigned int type;		/* Node type */
   unsigned char *value;		/* Node value */
   int value_len;
-  asn_node_t down;		/* Pointer to the son node */
-  asn_node_t right;		/* Pointer to the brother node */
-  asn_node_t left;		/* Pointer to the next list element */
+  asn1_node_t down;		/* Pointer to the son node */
+  asn1_node_t right;		/* Pointer to the brother node */
+  asn1_node_t left;		/* Pointer to the next list element */
   /* private fields: */
   unsigned char small_value[ASN1_SMALL_VALUE_SIZE];	/* For small values */
 };
@@ -74,11 +74,11 @@ struct asn_node_st
 
 /****************************************/
 /* Returns the first 8 bits.            */
-/* Used with the field type of asn_node_st */
+/* Used with the field type of asn1_node_st */
 /****************************************/
 #define type_field(x)     (x&0xFF)
 
-/* List of constants for field type of typedef asn_node_st  */
+/* List of constants for field type of typedef asn1_node_st  */
 #define TYPE_CONSTANT      ASN1_ETYPE_CONSTANT
 #define TYPE_IDENTIFIER    ASN1_ETYPE_IDENTIFIER
 #define TYPE_INTEGER       ASN1_ETYPE_INTEGER
@@ -104,7 +104,7 @@ struct asn_node_st
 
 
 /***********************************************************************/
-/* List of constants to better specify the type of typedef asn_node_st.   */
+/* List of constants to better specify the type of typedef asn1_node_st.   */
 /***********************************************************************/
 /*  Used with TYPE_TAG  */
 #define CONST_UNIVERSAL   (1<<8)
diff --git a/lib/libtasn1.h b/lib/libtasn1.h
index 8ad6b13..a75b554 100644
--- a/lib/libtasn1.h
+++ b/lib/libtasn1.h
@@ -106,9 +106,9 @@ extern "C"
   /* that represent an ASN.1 DEFINITION.                */
   /******************************************************/
 
-  typedef struct asn_node_st asn_node_st;
+  typedef struct asn1_node_st asn1_node_st;
 
-  typedef asn_node_st *asn_node_t;
+  typedef asn1_node_st *asn1_node_t;
 
   /* maximum number of characters of a name */
   /* inside a file with ASN1 definitons     */
@@ -118,13 +118,13 @@ extern "C"
   /*****************************************/
   /* For the on-disk format of ASN.1 trees */
   /*****************************************/
-  struct asn_static_node_st
+  struct asn1_static_node_st
   {
     const char *name;		/* Node name */
     unsigned int type;		/* Node type */
     const void *value;		/* Node value */
   };
-  typedef struct asn_static_node_st asn_static_node_t;
+  typedef struct asn1_static_node_st asn1_static_node_t;
 
 /* List of constants for field type of typedef node_asn  */
 #define ASN1_ETYPE_CONSTANT       1
@@ -150,14 +150,14 @@ extern "C"
 #define ASN1_ETYPE_ENUMERATED    21
 #define ASN1_ETYPE_GENERALSTRING 27
 
-  struct asn_data_node_st
+  struct asn1_data_node_st
   {
     const char *name;		/* Node name */
     const void *value;		/* Node value */
     unsigned int value_len;     /* Node value size */
     unsigned int type;		/* Node value type (ASN1_ETYPE_*) */
   };
-  typedef struct asn_data_node_st asn_data_node_st;
+  typedef struct asn1_data_node_st asn1_data_node_st;
 
   /***********************************/
   /*  Fixed constants                */
@@ -175,7 +175,7 @@ extern "C"
 
   extern ASN1_API int
     asn1_parser2tree (const char *file_name,
-		      asn_node_t * definitions, char *errorDescription);
+		      asn1_node_t * definitions, char *errorDescription);
 
   extern ASN1_API int
     asn1_parser2array (const char *inputFileName,
@@ -183,69 +183,69 @@ extern "C"
 		       const char *vectorName, char *errorDescription);
 
   extern ASN1_API int
-    asn1_array2tree (const asn_static_node_t * array,
-		     asn_node_t * definitions, char *errorDescription);
+    asn1_array2tree (const asn1_static_node_t * array,
+		     asn1_node_t * definitions, char *errorDescription);
 
   extern ASN1_API void
-    asn1_print_structure (FILE * out, asn_node_t structure,
+    asn1_print_structure (FILE * out, asn1_node_t structure,
 			  const char *name, int mode);
 
   extern ASN1_API int
-    asn1_create_element (asn_node_t definitions,
-			 const char *source_name, asn_node_t * element);
+    asn1_create_element (asn1_node_t definitions,
+			 const char *source_name, asn1_node_t * element);
 
-  extern ASN1_API int asn1_delete_structure (asn_node_t * structure);
+  extern ASN1_API int asn1_delete_structure (asn1_node_t * structure);
 
   extern ASN1_API int
-    asn1_delete_element (asn_node_t structure, const char *element_name);
+    asn1_delete_element (asn1_node_t structure, const char *element_name);
 
   extern ASN1_API int
-    asn1_write_value (asn_node_t node_root, const char *name,
+    asn1_write_value (asn1_node_t node_root, const char *name,
 		      const void *ivalue, int len);
 
   extern ASN1_API int
-    asn1_read_value (asn_node_t root, const char *name,
+    asn1_read_value (asn1_node_t root, const char *name,
 		     void *ivalue, int *len);
 
   extern ASN1_API int
-    asn1_read_node_value (asn_node_t node, asn_data_node_st* data);
+    asn1_read_node_value (asn1_node_t node, asn1_data_node_st* data);
 
   extern ASN1_API int
-    asn1_number_of_elements (asn_node_t element, const char *name, int *num);
+    asn1_number_of_elements (asn1_node_t element, const char *name, int *num);
 
   extern ASN1_API int
-    asn1_der_coding (asn_node_t element, const char *name,
+    asn1_der_coding (asn1_node_t element, const char *name,
 		     void *ider, int *len, char *ErrorDescription);
 
   extern ASN1_API int
-    asn1_der_decoding (asn_node_t * element, const void *ider,
+    asn1_der_decoding (asn1_node_t * element, const void *ider,
 		       int len, char *errorDescription);
 
   extern ASN1_API int
-    asn1_der_decoding_element (asn_node_t * structure,
+    asn1_der_decoding_element (asn1_node_t * structure,
 			       const char *elementName,
 			       const void *ider, int len,
 			       char *errorDescription);
 
   extern ASN1_API int
-    asn1_der_decoding_startEnd (asn_node_t element,
+    asn1_der_decoding_startEnd (asn1_node_t element,
 				const void *ider, int len,
 				const char *name_element,
 				int *start, int *end);
 
   extern ASN1_API int
-    asn1_expand_any_defined_by (asn_node_t definitions, asn_node_t * element);
+    asn1_expand_any_defined_by (asn1_node_t definitions, asn1_node_t * element);
 
   extern ASN1_API int
-    asn1_expand_octet_string (asn_node_t definitions,
-			      asn_node_t * element,
+    asn1_expand_octet_string (asn1_node_t definitions,
+			      asn1_node_t * element,
 			      const char *octetName, const char *objectName);
 
   extern ASN1_API int
-    asn1_read_tag (asn_node_t root, const char *name,
+    asn1_read_tag (asn1_node_t root, const char *name,
 		   int *tagValue, int *classValue);
 
-  extern ASN1_API const char *asn1_find_structure_from_oid (asn_node_t
+  extern ASN1_API const char *asn1_find_structure_from_oid (asn1_node_t
 							    definitions,
 							    const char
 							    *oidValue);
@@ -290,27 +290,27 @@ extern "C"
 
   /* Other utility functions. */
 
-  extern ASN1_API asn_node_t
-    asn1_find_node (asn_node_t pointer, const char *name);
+  extern ASN1_API asn1_node_t
+    asn1_find_node (asn1_node_t pointer, const char *name);
 
   extern ASN1_API int
-    asn1_copy_node (asn_node_t dst, const char *dst_name,
-		    asn_node_t src, const char *src_name);
+    asn1_copy_node (asn1_node_t dst, const char *dst_name,
+		    asn1_node_t src, const char *src_name);
 
 /* Compatibility types */
 
 typedef int asn1_retCode;	/* type returned by libtasn1 functions */
 
-#define node_asn_struct asn_node_st
-#define node_asn asn_node_st
-#define ASN1_TYPE asn_node_t
+#define node_asn_struct asn1_node_st
+#define node_asn asn1_node_st
+#define ASN1_TYPE asn1_node_t
 #define ASN1_TYPE_EMPTY NULL
 
-#define static_struct_asn asn_static_node_st
-#define ASN1_ARRAY_TYPE asn_static_node_t
+#define static_struct_asn asn1_static_node_st
+#define ASN1_ARRAY_TYPE asn1_static_node_t
 
-#define node_data_struct asn_data_node_st
-#define ASN1_DATA_NODE asn_data_node_st
+#define node_data_struct asn1_data_node_st
+#define ASN1_DATA_NODE asn1_data_node_st
 
 #ifdef __cplusplus
 }
diff --git a/lib/parser_aux.c b/lib/parser_aux.c
index c9a1801..9e792fd 100644
--- a/lib/parser_aux.c
+++ b/lib/parser_aux.c
@@ -35,7 +35,7 @@ char _asn1_identifierMissing[ASN1_MAX_NAME_SIZE + 1];	/* identifier name not fou
 /***********************************************/
 typedef struct list_struct
 {
-  asn_node_t node;
+  asn1_node_t node;
   struct list_struct *next;
 } list_type;
 
@@ -52,13 +52,13 @@ list_type *firstElement = NULL;
 /*         and CONST_ constants).                     */
 /* Return: pointer to the new element.                */
 /******************************************************/
-asn_node_t
+asn1_node_t
 _asn1_add_static_node (unsigned int type)
 {
   list_type *listElement;
-  asn_node_t punt;
+  asn1_node_t punt;
 
-  punt = calloc (1, sizeof (struct asn_node_st));
+  punt = calloc (1, sizeof (struct asn1_node_st));
   if (punt == NULL)
     return NULL;
 
@@ -90,10 +90,10 @@ _asn1_add_static_node (unsigned int type)
  *
  * Returns: the search result, or %NULL if not found.
  **/
-asn_node_t
-asn1_find_node (asn_node_t pointer, const char *name)
+asn1_node_t
+asn1_find_node (asn1_node_t pointer, const char *name)
 {
-  asn_node_t p;
+  asn1_node_t p;
   char *n_end, n[ASN1_MAX_NAME_SIZE + 1];
   const char *n_start;
   unsigned int nsize;
@@ -208,8 +208,8 @@ asn1_find_node (asn_node_t pointer, const char *name)
 /*   len: character number of value.                              */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-asn_node_t
-_asn1_set_value (asn_node_t node, const void *value, unsigned int len)
+asn1_node_t
+_asn1_set_value (asn1_node_t node, const void *value, unsigned int len)
 {
   if (node == NULL)
     return node;
@@ -251,8 +251,8 @@ _asn1_set_value (asn_node_t node, const void *value, unsigned int len)
 /*   len: character number of value.                              */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-asn_node_t
-_asn1_set_value_octet (asn_node_t node, const void *value, unsigned int len)
+asn1_node_t
+_asn1_set_value_octet (asn1_node_t node, const void *value, unsigned int len)
 {
   int len2;
   void *temp;
@@ -272,8 +272,8 @@ _asn1_set_value_octet (asn_node_t node, const void *value, unsigned int len)
 /* the same as _asn1_set_value except that it sets an already malloc'ed
  * value.
  */
-asn_node_t
-_asn1_set_value_m (asn_node_t node, void *value, unsigned int len)
+asn1_node_t
+_asn1_set_value_m (asn1_node_t node, void *value, unsigned int len)
 {
   if (node == NULL)
     return node;
@@ -305,8 +305,8 @@ _asn1_set_value_m (asn_node_t node, void *value, unsigned int len)
 /*   len: character number of value.                              */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-asn_node_t
-_asn1_append_value (asn_node_t node, const void *value, unsigned int len)
+asn1_node_t
+_asn1_append_value (asn1_node_t node, const void *value, unsigned int len)
 {
   if (node == NULL)
     return node;
@@ -355,8 +355,8 @@ _asn1_append_value (asn_node_t node, const void *value, unsigned int len)
 /*         to set.                                                */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-asn_node_t
-_asn1_set_name (asn_node_t node, const char *name)
+asn1_node_t
+_asn1_set_name (asn1_node_t node, const char *name)
 {
 unsigned int nsize;
 
@@ -384,8 +384,8 @@ unsigned int nsize;
 /*   src: a source element pointer.                               */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-asn_node_t
-_asn1_cpy_name (asn_node_t dst, asn_node_t src)
+asn1_node_t
+_asn1_cpy_name (asn1_node_t dst, asn1_node_t src)
 {
   if (dst == NULL)
     return dst;
@@ -412,8 +412,8 @@ _asn1_cpy_name (asn_node_t dst, asn_node_t src)
 /*          by NODE.                                              */
 /* Return: pointer to *NODE.                                      */
 /******************************************************************/
-asn_node_t
-_asn1_set_right (asn_node_t node, asn_node_t right)
+asn1_node_t
+_asn1_set_right (asn1_node_t node, asn1_node_t right)
 {
   if (node == NULL)
     return node;
@@ -431,10 +431,10 @@ _asn1_set_right (asn_node_t node, asn_node_t right)
 /*   node: starting element pointer.                              */
 /* Return: pointer to the last element along the right chain.     */
 /******************************************************************/
-asn_node_t
-_asn1_get_last_right (asn_node_t node)
+asn1_node_t
+_asn1_get_last_right (asn1_node_t node)
 {
-  asn_node_t p;
+  asn1_node_t p;
 
   if (node == NULL)
     return NULL;
@@ -452,7 +452,7 @@ _asn1_get_last_right (asn_node_t node)
 /*   node: NODE_ASN element pointer.                              */
 /******************************************************************/
 void
-_asn1_remove_node (asn_node_t node)
+_asn1_remove_node (asn1_node_t node)
 {
   if (node == NULL)
     return;
@@ -469,10 +469,10 @@ _asn1_remove_node (asn_node_t node)
 /*   node: NODE_ASN element pointer.                              */
 /* Return: Null if not found.                                     */
 /******************************************************************/
-asn_node_t
-_asn1_find_up (asn_node_t node)
+asn1_node_t
+_asn1_find_up (asn1_node_t node)
 {
-  asn_node_t p;
+  asn1_node_t p;
 
   if (node == NULL)
     return NULL;
@@ -568,9 +568,9 @@ _asn1_ltostr (long v, char *str)
 /*   otherwise ASN1_SUCCESS                                             */
 /******************************************************************/
 int
-_asn1_change_integer_value (asn_node_t node)
+_asn1_change_integer_value (asn1_node_t node)
 {
-  asn_node_t p;
+  asn1_node_t p;
   unsigned char val[SIZEOF_UNSIGNED_LONG_INT];
   unsigned char val2[SIZEOF_UNSIGNED_LONG_INT + 1];
   int len;
@@ -635,9 +635,9 @@ _asn1_change_integer_value (asn_node_t node)
 /*   otherwise ASN1_SUCCESS                                             */
 /******************************************************************/
 int
-_asn1_expand_object_id (asn_node_t node)
+_asn1_expand_object_id (asn1_node_t node)
 {
-  asn_node_t p, p2, p3, p4, p5;
+  asn1_node_t p, p2, p3, p4, p5;
   char name_root[ASN1_MAX_NAME_SIZE], name2[2 * ASN1_MAX_NAME_SIZE + 1];
   int move, tlen;
 
@@ -818,9 +818,9 @@ _asn1_expand_object_id (asn_node_t node)
 /*   otherwise ASN1_SUCCESS                                             */
 /******************************************************************/
 int
-_asn1_type_set_config (asn_node_t node)
+_asn1_type_set_config (asn1_node_t node)
 {
-  asn_node_t p, p2;
+  asn1_node_t p, p2;
   int move;
 
   if (node == NULL)
@@ -891,9 +891,9 @@ _asn1_type_set_config (asn_node_t node)
 /*   otherwise ASN1_SUCCESS                                       */
 /******************************************************************/
 int
-_asn1_check_identifier (asn_node_t node)
+_asn1_check_identifier (asn1_node_t node)
 {
-  asn_node_t p, p2;
+  asn1_node_t p, p2;
   char name2[ASN1_MAX_NAME_SIZE * 2 + 2];
 
   if (node == NULL)
@@ -998,9 +998,9 @@ _asn1_check_identifier (asn_node_t node)
 /*   otherwise ASN1_SUCCESS                                       */
 /******************************************************************/
 int
-_asn1_set_default_tag (asn_node_t node)
+_asn1_set_default_tag (asn1_node_t node)
 {
-  asn_node_t p;
+  asn1_node_t p;
 
   if ((node == NULL) || (type_field (node->type) != TYPE_DEFINITIONS))
     return ASN1_ELEMENT_NOT_FOUND;
diff --git a/lib/parser_aux.h b/lib/parser_aux.h
index a224e78..8838866 100644
--- a/lib/parser_aux.h
+++ b/lib/parser_aux.h
@@ -27,28 +27,28 @@
 /***************************************/
 /*  Functions used by ASN.1 parser     */
 /***************************************/
-asn_node_t _asn1_add_static_node (unsigned int type);
+asn1_node_t _asn1_add_static_node (unsigned int type);
 
-asn_node_t
-_asn1_set_value (asn_node_t node, const void *value, unsigned int len);
+asn1_node_t
+_asn1_set_value (asn1_node_t node, const void *value, unsigned int len);
 
-asn_node_t _asn1_set_value_m (asn_node_t node, void *value, unsigned int len);
+asn1_node_t _asn1_set_value_m (asn1_node_t node, void *value, unsigned int len);
 
-asn_node_t
-_asn1_set_value_octet (asn_node_t node, const void *value, unsigned int len);
+asn1_node_t
+_asn1_set_value_octet (asn1_node_t node, const void *value, unsigned int len);
 
-asn_node_t
-_asn1_append_value (asn_node_t node, const void *value, unsigned int len);
+asn1_node_t
+_asn1_append_value (asn1_node_t node, const void *value, unsigned int len);
 
-asn_node_t _asn1_set_name (asn_node_t node, const char *name);
+asn1_node_t _asn1_set_name (asn1_node_t node, const char *name);
 
-asn_node_t _asn1_cpy_name (asn_node_t dst, asn_node_t src);
+asn1_node_t _asn1_cpy_name (asn1_node_t dst, asn1_node_t src);
 
-asn_node_t _asn1_set_right (asn_node_t node, asn_node_t right);
+asn1_node_t _asn1_set_right (asn1_node_t node, asn1_node_t right);
 
-asn_node_t _asn1_get_last_right (asn_node_t node);
+asn1_node_t _asn1_get_last_right (asn1_node_t node);
 
-void _asn1_remove_node (asn_node_t node);
+void _asn1_remove_node (asn1_node_t node);
 
 void _asn1_delete_list (void);
 
@@ -56,17 +56,17 @@ void _asn1_delete_list_and_nodes (void);
 
 char *_asn1_ltostr (long v, char *str);
 
-asn_node_t _asn1_find_up (asn_node_t node);
+asn1_node_t _asn1_find_up (asn1_node_t node);
 
-int _asn1_change_integer_value (asn_node_t node);
+int _asn1_change_integer_value (asn1_node_t node);
 
-int _asn1_expand_object_id (asn_node_t node);
+int _asn1_expand_object_id (asn1_node_t node);
 
-int _asn1_type_set_config (asn_node_t node);
+int _asn1_type_set_config (asn1_node_t node);
 
-int _asn1_check_identifier (asn_node_t node);
+int _asn1_check_identifier (asn1_node_t node);
 
-int _asn1_set_default_tag (asn_node_t node);
+int _asn1_set_default_tag (asn1_node_t node);
 
 /******************************************************************/
 /* Function : _asn1_get_right                                     */
@@ -76,8 +76,8 @@ int _asn1_set_default_tag (asn_node_t node);
 /*   node: NODE_ASN element pointer.                              */
 /* Return: field RIGHT of NODE.                                   */
 /******************************************************************/
-inline static asn_node_t
-_asn1_get_right (asn_node_t node)
+inline static asn1_node_t
+_asn1_get_right (asn1_node_t node)
 {
   if (node == NULL)
     return NULL;
@@ -93,8 +93,8 @@ _asn1_get_right (asn_node_t node)
 /*          by NODE.                                              */
 /* Return: pointer to *NODE.                                      */
 /******************************************************************/
-inline static asn_node_t
-_asn1_set_down (asn_node_t node, asn_node_t down)
+inline static asn1_node_t
+_asn1_set_down (asn1_node_t node, asn1_node_t down)
 {
   if (node == NULL)
     return node;
@@ -112,8 +112,8 @@ _asn1_set_down (asn_node_t node, asn_node_t down)
 /*   node: NODE_ASN element pointer.                              */
 /* Return: field DOWN of NODE.                                    */
 /******************************************************************/
-inline static asn_node_t
-_asn1_get_down (asn_node_t node)
+inline static asn1_node_t
+_asn1_get_down (asn1_node_t node)
 {
   if (node == NULL)
     return NULL;
@@ -128,7 +128,7 @@ _asn1_get_down (asn_node_t node)
 /* Return: a null terminated string.                              */
 /******************************************************************/
 inline static char *
-_asn1_get_name (asn_node_t node)
+_asn1_get_name (asn1_node_t node)
 {
   if (node == NULL)
     return NULL;
@@ -146,8 +146,8 @@ _asn1_get_name (asn_node_t node)
 /*          value of field TYPE.                                  */
 /* Return: NODE pointer.                                          */
 /******************************************************************/
-inline static asn_node_t
-_asn1_mod_type (asn_node_t node, unsigned int value)
+inline static asn1_node_t
+_asn1_mod_type (asn1_node_t node, unsigned int value)
 {
   if (node == NULL)
     return node;
diff --git a/lib/structure.c b/lib/structure.c
index 4ce9f6a..3eb562f 100644
--- a/lib/structure.c
+++ b/lib/structure.c
@@ -44,12 +44,12 @@ extern char _asn1_identifierMissing[];
 /*         and CONST_ constants).                     */
 /* Return: pointer to the new element.                */
 /******************************************************/
-asn_node_t
+asn1_node_t
 _asn1_add_single_node (unsigned int type)
 {
-  asn_node_t punt;
+  asn1_node_t punt;
 
-  punt = calloc (1, sizeof (struct asn_node_st));
+  punt = calloc (1, sizeof (struct asn1_node_st));
   if (punt == NULL)
     return NULL;
 
@@ -67,8 +67,8 @@ _asn1_add_single_node (unsigned int type)
 /*   node: NODE_ASN element pointer.                              */
 /* Return: NULL if not found.                                     */
 /******************************************************************/
-asn_node_t
-_asn1_find_left (asn_node_t node)
+asn1_node_t
+_asn1_find_left (asn1_node_t node)
 {
   if ((node == NULL) || (node->left == NULL) || (node->left->down == node))
     return NULL;
@@ -78,11 +78,11 @@ _asn1_find_left (asn_node_t node)
 
 
 int
-_asn1_create_static_structure (asn_node_t pointer, char *output_file_name,
+_asn1_create_static_structure (asn1_node_t pointer, char *output_file_name,
 			       char *vector_name)
 {
   FILE *file;
-  asn_node_t p;
+  asn1_node_t p;
   unsigned long t;
 
   file = fopen (output_file_name, "w");
@@ -96,7 +96,7 @@ _asn1_create_static_structure (asn_node_t pointer, char *output_file_name,
 
   fprintf (file, "#include <libtasn1.h>\n\n");
 
-  fprintf (file, "const asn_static_node_t %s[] = {\n", vector_name);
+  fprintf (file, "const asn1_static_node_t %s[] = {\n", vector_name);
 
   p = pointer;
 
@@ -174,10 +174,10 @@ _asn1_create_static_structure (asn_node_t pointer, char *output_file_name,
  *   %ASN1_ARRAY_ERROR if the array pointed by @array is wrong.
  **/
 int
-asn1_array2tree (const asn_static_node_t * array, asn_node_t * definitions,
+asn1_array2tree (const asn1_static_node_t * array, asn1_node_t * definitions,
 		 char *errorDescription)
 {
-  asn_node_t p, p_last = NULL;
+  asn1_node_t p, p_last = NULL;
   unsigned long k;
   int move;
   int result;
@@ -282,9 +282,9 @@ asn1_array2tree (const asn_static_node_t * array, asn_node_t * definitions,
  *   *@structure was NULL.
  **/
 int
-asn1_delete_structure (asn_node_t * structure)
+asn1_delete_structure (asn1_node_t * structure)
 {
-  asn_node_t p, p2, p3;
+  asn1_node_t p, p2, p3;
 
   if (*structure == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
@@ -346,9 +346,9 @@ asn1_delete_structure (asn_node_t * structure)
  *   the @element_name was not found.
  **/
 int
-asn1_delete_element (asn_node_t structure, const char *element_name)
+asn1_delete_element (asn1_node_t structure, const char *element_name)
 {
-  asn_node_t p2, p3, source_node;
+  asn1_node_t p2, p3, source_node;
 
   source_node = asn1_find_node (structure, element_name);
 
@@ -371,10 +371,10 @@ asn1_delete_element (asn_node_t structure, const char *element_name)
   return asn1_delete_structure (&source_node);
 }
 
-asn_node_t
-_asn1_copy_structure3 (asn_node_t source_node)
+asn1_node_t
+_asn1_copy_structure3 (asn1_node_t source_node)
 {
-  asn_node_t dest_node, p_s, p_d, p_d_prev;
+  asn1_node_t dest_node, p_s, p_d, p_d_prev;
   int move;
 
   if (source_node == NULL)
@@ -429,10 +429,10 @@ _asn1_copy_structure3 (asn_node_t source_node)
 }
 
 
-static asn_node_t
-_asn1_copy_structure2 (asn_node_t root, const char *source_name)
+static asn1_node_t
+_asn1_copy_structure2 (asn1_node_t root, const char *source_name)
 {
-  asn_node_t source_node;
+  asn1_node_t source_node;
 
   source_node = asn1_find_node (root, source_name);
 
@@ -442,9 +442,9 @@ _asn1_copy_structure2 (asn_node_t root, const char *source_name)
 
 
 static int
-_asn1_type_choice_config (asn_node_t node)
+_asn1_type_choice_config (asn1_node_t node)
 {
-  asn_node_t p, p2, p3, p4;
+  asn1_node_t p, p2, p3, p4;
   int move, tlen;
 
   if (node == NULL)
@@ -527,9 +527,9 @@ _asn1_type_choice_config (asn_node_t node)
 
 
 static int
-_asn1_expand_identifier (asn_node_t * node, asn_node_t root)
+_asn1_expand_identifier (asn1_node_t * node, asn1_node_t root)
 {
-  asn_node_t p, p2, p3;
+  asn1_node_t p, p2, p3;
   char name2[ASN1_MAX_NAME_SIZE + 2];
   int move;
 
@@ -649,10 +649,10 @@ _asn1_expand_identifier (asn_node_t * node, asn_node_t root)
  *   @source_name is not known.
  **/
 int
-asn1_create_element (asn_node_t definitions, const char *source_name,
-		     asn_node_t * element)
+asn1_create_element (asn1_node_t definitions, const char *source_name,
+		     asn1_node_t * element)
 {
-  asn_node_t dest_node;
+  asn1_node_t dest_node;
   int res;
 
   dest_node = _asn1_copy_structure2 (definitions, source_name);
@@ -684,10 +684,10 @@ asn1_create_element (asn_node_t definitions, const char *source_name,
  * from the @name element inside the structure @structure.
  **/
 void
-asn1_print_structure (FILE * out, asn_node_t structure, const char *name,
+asn1_print_structure (FILE * out, asn1_node_t structure, const char *name,
 		      int mode)
 {
-  asn_node_t p, root;
+  asn1_node_t p, root;
   int k, indent = 0, len, len2, len3;
 
   if (out == NULL)
@@ -1048,9 +1048,9 @@ asn1_print_structure (FILE * out, asn_node_t structure, const char *name,
  *   @name is not known, %ASN1_GENERIC_ERROR if pointer @num is %NULL.
  **/
 int
-asn1_number_of_elements (asn_node_t element, const char *name, int *num)
+asn1_number_of_elements (asn1_node_t element, const char *name, int *num)
 {
-  asn_node_t node, p;
+  asn1_node_t node, p;
 
   if (num == NULL)
     return ASN1_GENERIC_ERROR;
@@ -1086,11 +1086,11 @@ asn1_number_of_elements (asn_node_t element, const char *name, int *num)
  *   the OID.
  **/
 const char *
-asn1_find_structure_from_oid (asn_node_t definitions, const char *oidValue)
+asn1_find_structure_from_oid (asn1_node_t definitions, const char *oidValue)
 {
   char definitionsName[ASN1_MAX_NAME_SIZE], name[2 * ASN1_MAX_NAME_SIZE + 1];
   char value[ASN1_MAX_NAME_SIZE];
-  asn_node_t p;
+  asn1_node_t p;
   int len;
   int result;
 
@@ -1131,24 +1131,24 @@ asn1_find_structure_from_oid (asn_node_t definitions, const char *oidValue)
 
 /**
  * asn1_copy_node:
- * @dst: Destination asn_node_t node.
+ * @dst: Destination asn1_node_t node.
  * @dst_name: Field name in destination node.
- * @src: Source asn_node_t node.
+ * @src: Source asn1_node_t node.
  * @src_name: Field name in source node.
  *
- * Create a deep copy of a asn_node_t variable.
+ * Create a deep copy of a asn1_node_t variable.
  *
  * Returns: Return %ASN1_SUCCESS on success.
  **/
 int
-asn1_copy_node (asn_node_t dst, const char *dst_name,
-		asn_node_t src, const char *src_name)
+asn1_copy_node (asn1_node_t dst, const char *dst_name,
+		asn1_node_t src, const char *src_name)
 {
 /* FIXME: rewrite using copy_structure().
  * It seems quite hard to do.
  */
   int result;
-  asn_node_t dst_node;
+  asn1_node_t dst_node;
   void *data = NULL;
   int size = 0;
 
diff --git a/lib/structure.h b/lib/structure.h
index db7e3be..1e177c0 100644
--- a/lib/structure.h
+++ b/lib/structure.h
@@ -28,14 +28,14 @@
 #ifndef _STRUCTURE_H
 #define _STRUCTURE_H
 
-int _asn1_create_static_structure (asn_node_t pointer,
+int _asn1_create_static_structure (asn1_node_t pointer,
 					    char *output_file_name,
 					    char *vector_name);
 
-asn_node_t _asn1_copy_structure3 (asn_node_t source_node);
+asn1_node_t _asn1_copy_structure3 (asn1_node_t source_node);
 
-asn_node_t _asn1_add_single_node (unsigned int type);
+asn1_node_t _asn1_add_single_node (unsigned int type);
 
-asn_node_t _asn1_find_left (asn_node_t node);
+asn1_node_t _asn1_find_left (asn1_node_t node);
 
 #endif
diff --git a/src/asn1Coding.c b/src/asn1Coding.c
index b9a7ca3..b11dbcb 100644
--- a/src/asn1Coding.c
+++ b/src/asn1Coding.c
@@ -133,8 +133,8 @@ main (int argc, char *argv[])
   char *inputFileAsnName = NULL;
   char *inputFileAssignmentName = NULL;
   int checkSyntaxOnly = 0;
-  asn_node_t definitions = NULL;
-  asn_node_t structure = NULL;
+  asn1_node_t definitions = NULL;
+  asn1_node_t structure = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   int asn1_result = ASN1_SUCCESS;
   FILE *outputFile;
diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c
index f942734..e2e32a7 100644
--- a/src/asn1Decoding.c
+++ b/src/asn1Decoding.c
@@ -33,7 +33,7 @@
 #include <read-file.h>
 #include "benchmark.h"
 
-static int decode(asn_node_t definitions, const char* typeName, void* der, int der_len, int benchmark);
+static int decode(asn1_node_t definitions, const char* typeName, void* der, int der_len, int benchmark);
 
 /* This feature is available in gcc versions 2.5 and later.  */
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
   char *inputFileAsnName = NULL;
   char *inputFileDerName = NULL;
   char *typeName = NULL;
-  asn_node_t definitions = NULL;
+  asn1_node_t definitions = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   int asn1_result = ASN1_SUCCESS;
   unsigned char *der;
@@ -224,11 +224,11 @@ main (int argc, char *argv[])
   exit (0);
 }
 
-static int simple_decode(asn_node_t definitions, const char* typeName, void* der, int der_len, int benchmark)
+static int simple_decode(asn1_node_t definitions, const char* typeName, void* der, int der_len, int benchmark)
 {
   
 int asn1_result;
-asn_node_t structure = NULL;
+asn1_node_t structure = NULL;
 char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
 
   asn1_result = asn1_create_element (definitions, typeName, &structure);
@@ -263,7 +263,7 @@ char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   return ASN1_SUCCESS;
 }
 
-static int decode(asn_node_t definitions, const char* typeName, void* der, int der_len, int benchmark)
+static int decode(asn1_node_t definitions, const char* typeName, void* der, int der_len, int benchmark)
 {
 struct benchmark_st st;
 
diff --git a/src/asn1Parser.c b/src/asn1Parser.c
index 4bd4d68..054af7c 100644
--- a/src/asn1Parser.c
+++ b/src/asn1Parser.c
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
   char *inputFileName = NULL;
   char *vectorName = NULL;
   int checkSyntaxOnly = 0;
-  asn_node_t pointer = NULL;
+  asn1_node_t pointer = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   int parse_result = ASN1_SUCCESS;
 
diff --git a/tests/Test_encoding.c b/tests/Test_encoding.c
index 1c0323d..370864b 100644
--- a/tests/Test_encoding.c
+++ b/tests/Test_encoding.c
@@ -37,8 +37,8 @@ int
 main (int argc, char *argv[])
 {
   int result;
-  asn_node_t definitions = NULL;
-  asn_node_t asn1_element = NULL;
+  asn1_node_t definitions = NULL;
+  asn1_node_t asn1_element = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   const char *treefile = getenv ("ASN1ENCODING");
 
diff --git a/tests/Test_indefinite.c b/tests/Test_indefinite.c
index 108f3db..3387a11 100644
--- a/tests/Test_indefinite.c
+++ b/tests/Test_indefinite.c
@@ -41,8 +41,8 @@ main (int argc, char *argv[])
 {
   int result;
   char buffer[10 * 1024];
-  asn_node_t definitions = NULL;
-  asn_node_t asn1_element = NULL;
+  asn1_node_t definitions = NULL;
+  asn1_node_t asn1_element = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   FILE *out, *fd;
   ssize_t size;
diff --git a/tests/Test_parser.c b/tests/Test_parser.c
index 2d5dd48..062fc2f 100644
--- a/tests/Test_parser.c
+++ b/tests/Test_parser.c
@@ -148,7 +148,7 @@ int
 main (int argc, char *argv[])
 {
   int result;
-  asn_node_t definitions = NULL;
+  asn1_node_t definitions = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   test_type *test;
   int errorCounter = 0, testCounter = 0;
diff --git a/tests/Test_tree.c b/tests/Test_tree.c
index 295859b..32c57e1 100644
--- a/tests/Test_tree.c
+++ b/tests/Test_tree.c
@@ -433,8 +433,8 @@ int
 main (int argc, char *argv[])
 {
   int result;
-  asn_node_t definitions = NULL;
-  asn_node_t asn1_element = NULL;
+  asn1_node_t definitions = NULL;
+  asn1_node_t asn1_element = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   FILE *out;
   test_type *test;
diff --git a/tests/Test_tree_asn1_tab.c b/tests/Test_tree_asn1_tab.c
index caf8cfc..9866eab 100644
--- a/tests/Test_tree_asn1_tab.c
+++ b/tests/Test_tree_asn1_tab.c
@@ -4,7 +4,7 @@
 
 #include <libtasn1.h>
 
-const asn_static_node_t Test_tree_asn1_tab[] = {
+const asn1_static_node_t Test_tree_asn1_tab[] = {
   { "TEST_TREE", 536875024, NULL },
   { NULL, 1610612748, NULL },
   { "iso", 1073741825, "1"},


hooks/post-receive
-- 
GNU libtasn1


From MAILER-DAEMON Tue Oct 09 13:50:29 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TLdwr-00046f-En
	for mharc-libtasn1-commit@gnu.org; Tue, 09 Oct 2012 13:50:29 -0400
Received: from eggs.gnu.org ([208.118.235.92]:45180)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TLdwG-0003aN-7V
	for libtasn1-commit@gnu.org; Tue, 09 Oct 2012 13:50:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TLdvs-00032H-4E
	for libtasn1-commit@gnu.org; Tue, 09 Oct 2012 13:49:51 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:42683)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TLdvr-00031r-VI
	for libtasn1-commit@gnu.org; Tue, 09 Oct 2012 13:49:28 -0400
Received: from nmav by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TLdvr-00088r-Dc
	for libtasn1-commit@gnu.org; Tue, 09 Oct 2012 17:49:27 +0000
Date: Tue, 09 Oct 2012 17:49:27 +0000
Message-Id: <E1TLdvr-00088r-Dc@vcs.savannah.gnu.org>
From: "Nikos Mavrogiannopoulos" <nmav@gnutls.org>
To: libtasn1-commit@gnu.org
Subject: [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_13-49-g5469305
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 22dd88046a752020c9b7aec5710231da92cdbeb7
X-Git-Newrev: 546930508edce93729d41c87901b20b2eb3631fc
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libtasn1-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libtasn1 <libtasn1-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtasn1-commit>
List-Post: <mailto:libtasn1-commit@gnu.org>
List-Help: <mailto:libtasn1-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Oct 2012 17:50:28 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=546930508edce93729d41c87901b20b2eb3631fc

The branch, master has been updated
       via  546930508edce93729d41c87901b20b2eb3631fc (commit)
       via  d154578295f0fda35cf0a1ec78648f7ec581bbed (commit)
      from  22dd88046a752020c9b7aec5710231da92cdbeb7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 546930508edce93729d41c87901b20b2eb3631fc
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Tue Oct 9 19:49:13 2012 +0200

    Silence tests.

commit d154578295f0fda35cf0a1ec78648f7ec581bbed
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Tue Oct 9 19:30:05 2012 +0200

    Allow empty IDENTIFIERS in ASN1 definitions. Suggested by Ivan Shmakov.

-----------------------------------------------------------------------

Summary of changes:
 lib/ASN1.c              |   38 +++++++++++++++++++++++++-------------
 lib/ASN1.y              |    2 ++
 tests/Test_encoding.c   |   16 +++++++++++-----
 tests/Test_errors.c     |    7 ++++++-
 tests/Test_indefinite.c |   15 +++++++++++----
 tests/Test_overflow.c   |   27 +++++++++++++++++++++------
 tests/Test_parser.c     |   22 ++++++++++++++++------
 tests/Test_tree.c       |   44 +++++++++++++++++++++++++++++---------------
 tests/crlf              |    2 +-
 9 files changed, 122 insertions(+), 51 deletions(-)

diff --git a/lib/ASN1.c b/lib/ASN1.c
index 48da82f..179d762 100644
--- a/lib/ASN1.c
+++ b/lib/ASN1.c
@@ -491,7 +491,7 @@ union yyalloc
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  43
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  99
+#define YYNRULES  100
 /* YYNRULES -- Number of states.  */
 #define YYNSTATES  190
 
@@ -551,7 +551,8 @@ static const yytype_uint16 yyprhs[] =
      195,   197,   199,   201,   203,   205,   207,   209,   211,   213,
      215,   217,   219,   222,   224,   227,   230,   233,   235,   239,
      244,   248,   253,   258,   262,   267,   272,   274,   279,   283,
-     291,   298,   303,   305,   307,   309,   312,   317,   321,   323
+     291,   298,   303,   305,   307,   309,   312,   317,   321,   323,
+     325
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
@@ -589,7 +590,7 @@ static const yytype_int8 yyrhs[] =
       -1,     5,     5,     3,    49,    62,    50,    -1,     5,     7,
        3,    56,    -1,    89,    -1,    90,    -1,    91,    -1,    92,
       91,    -1,     5,    49,    62,    50,    -1,     5,    49,    50,
-      -1,    29,    -1,    30,    -1
+      -1,     5,    -1,    29,    -1,    30,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -604,7 +605,8 @@ static const yytype_uint16 yyrline[] =
      276,   277,   278,   279,   280,   281,   282,   283,   284,   285,
      286,   289,   290,   295,   296,   299,   302,   305,   306,   310,
      312,   314,   319,   321,   323,   328,   332,   333,   338,   341,
-     345,   350,   356,   357,   360,   361,   365,   368,   392,   393
+     345,   350,   356,   357,   360,   361,   365,   368,   370,   394,
+     395
 };
 #endif
 
@@ -661,7 +663,8 @@ static const yytype_uint8 yyr1[] =
       80,    80,    80,    80,    80,    80,    80,    80,    80,    80,
       80,    81,    81,    82,    82,    82,    83,    84,    84,    85,
       85,    85,    86,    86,    86,    87,    88,    88,    89,    90,
-      90,    90,    91,    91,    92,    92,    93,    93,    94,    94
+      90,    90,    91,    91,    92,    92,    93,    93,    93,    94,
+      94
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -676,7 +679,8 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
        1,     1,     2,     1,     2,     2,     2,     1,     3,     4,
        3,     4,     4,     3,     4,     4,     1,     4,     3,     7,
-       6,     4,     1,     1,     1,     2,     4,     3,     1,     1
+       6,     4,     1,     1,     1,     2,     4,     3,     1,     1,
+       1
 };
 
 /* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
@@ -684,8 +688,8 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       0,     0,     0,     0,     0,     1,     0,     8,     9,    97,
-      16,    18,     0,    98,    99,     0,     0,    96,    19,     0,
+       0,    98,     0,     0,     0,     1,     0,     8,     9,    97,
+      16,    18,     0,    99,   100,     0,     0,    96,    19,     0,
        0,     0,    17,     0,     0,    92,    93,    94,     0,     0,
        0,     0,     0,     2,    95,    56,    33,     0,     0,     0,
        0,     0,    37,    70,    86,     0,    38,    39,    44,     0,
@@ -2382,21 +2386,29 @@ yyreduce:
   case 98:
 
 /* Line 1806 of yacc.c  */
-#line 392 "ASN1.y"
-    {(yyval.constant)=CONST_EXPLICIT;}
+#line 370 "ASN1.y"
+    {(yyval.node)=_asn1_add_static_node(TYPE_OBJECT_ID);
+                                                          _asn1_set_name((yyval.node),(yyvsp[(1) - (1)].str));}
     break;
 
   case 99:
 
 /* Line 1806 of yacc.c  */
-#line 393 "ASN1.y"
+#line 394 "ASN1.y"
+    {(yyval.constant)=CONST_EXPLICIT;}
+    break;
+
+  case 100:
+
+/* Line 1806 of yacc.c  */
+#line 395 "ASN1.y"
     {(yyval.constant)=CONST_IMPLICIT;}
     break;
 
 
 
 /* Line 1806 of yacc.c  */
-#line 2400 "ASN1.c"
+#line 2412 "ASN1.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -2627,7 +2639,7 @@ yyreturn:
 
 
 /* Line 2067 of yacc.c  */
-#line 397 "ASN1.y"
+#line 399 "ASN1.y"
 
 
 
diff --git a/lib/ASN1.y b/lib/ASN1.y
index 66df21a..18c93b3 100644
--- a/lib/ASN1.y
+++ b/lib/ASN1.y
@@ -367,6 +367,8 @@ definitions_id  :  IDENTIFIER  '{' obj_constant_list '}' {$$=_asn1_add_static_no
                                                           _asn1_set_name($$,$1);}
                  | IDENTIFIER  '{' '}'                   {$$=_asn1_add_static_node(TYPE_OBJECT_ID);
                                                           _asn1_set_name($$,$1);}
+                 | IDENTIFIER                            {$$=_asn1_add_static_node(TYPE_OBJECT_ID);
+                                                          _asn1_set_name($$,$1);}
 ;
 
 /*
diff --git a/tests/Test_encoding.c b/tests/Test_encoding.c
index 370864b..6b3e7bb 100644
--- a/tests/Test_encoding.c
+++ b/tests/Test_encoding.c
@@ -36,18 +36,24 @@ int data_size = sizeof (data);
 int
 main (int argc, char *argv[])
 {
-  int result;
+  int result, verbose = 0;
   asn1_node_t definitions = NULL;
   asn1_node_t asn1_element = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   const char *treefile = getenv ("ASN1ENCODING");
 
+  if (argc > 1)
+    verbose = 1;
+
   if (!treefile)
     treefile = "Test_encoding.asn";
 
-  printf ("\n\n/****************************************/\n");
-  printf ("/*     Test sequence : coding-decoding  */\n");
-  printf ("/****************************************/\n\n");
+  if (verbose != 0)
+    {
+      printf ("\n\n/****************************************/\n");
+      printf ("/*     Test sequence : coding-decoding  */\n");
+      printf ("/****************************************/\n\n");
+   }
 
   /* Check version */
   if (asn1_check_version ("0.3.3") == NULL)
@@ -124,6 +130,6 @@ main (int argc, char *argv[])
 
   asn1_delete_structure (&asn1_element);
 
-  printf ("Success\n");
+  if (verbose) printf ("Success\n");
   exit (0);
 }
diff --git a/tests/Test_errors.c b/tests/Test_errors.c
index 8480b22..fcd1704 100644
--- a/tests/Test_errors.c
+++ b/tests/Test_errors.c
@@ -25,11 +25,16 @@ main (int argc, char *argv[])
 {
   int ec = 0;
   const char *errstr;
+  int verbose = 0;
+  
+  if (argc > 1)
+    verbose = 1; 
 
   do
     {
       errstr = asn1_strerror (ec);
-      asn1_perror (ec);
+      if (verbose != 0)
+        asn1_perror (ec);
       ec++;
     }
   while (errstr);
diff --git a/tests/Test_indefinite.c b/tests/Test_indefinite.c
index 3387a11..e951b46 100644
--- a/tests/Test_indefinite.c
+++ b/tests/Test_indefinite.c
@@ -48,6 +48,10 @@ main (int argc, char *argv[])
   ssize_t size;
   const char *treefile = getenv ("ASN1PKIX");
   const char *indeffile = getenv ("ASN1INDEF");
+  int verbose = 0;
+
+  if (argc > 1)
+    verbose = 1;
 
   if (!treefile)
     treefile = "pkix.asn";
@@ -55,10 +59,13 @@ main (int argc, char *argv[])
   if (!indeffile)
     indeffile = "TestIndef.p12";
 
-  printf ("\n\n/****************************************/\n");
-  printf ("/*     Test sequence : Test_indefinite  */\n");
-  printf ("/****************************************/\n\n");
-  printf ("ASN1TREE: %s\n", treefile);
+  if (verbose)
+    {
+      printf ("\n\n/****************************************/\n");
+      printf ("/*     Test sequence : Test_indefinite  */\n");
+      printf ("/****************************************/\n\n");
+      printf ("ASN1TREE: %s\n", treefile);
+    }
 
   /* Check version */
   if (asn1_check_version ("0.2.11") == NULL)
diff --git a/tests/Test_overflow.c b/tests/Test_overflow.c
index cbf9381..6f81dc5 100644
--- a/tests/Test_overflow.c
+++ b/tests/Test_overflow.c
@@ -28,10 +28,15 @@
 #include "libtasn1.h"
 
 int
-main (void)
+main (int argc, char** argv)
 {
   /* Test that values larger than long are rejected.  This has worked
      fine with all versions of libtasn1. */
+  int verbose = 0;
+  
+  if (argc > 1)
+    verbose = 1;
+
   {
     unsigned char der[] = "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF";
     long l;
@@ -40,7 +45,9 @@ main (void)
     l = asn1_get_length_der (der, sizeof der, &len);
 
     if (l == -2L)
-      puts ("OK: asn1_get_length_der bignum");
+      {
+        if (verbose) puts ("OK: asn1_get_length_der bignum");
+      }
     else
       {
 	printf ("ERROR: asn1_get_length_der bignum (l %ld len %d)\n", l, len);
@@ -63,7 +70,9 @@ main (void)
       l = asn1_get_length_der (der, der_len, &len);
 
       if (l == -2L)
-	puts ("OK: asn1_get_length_der intnum");
+        {
+	  if (verbose) puts ("OK: asn1_get_length_der intnum");
+        }
       else
 	{
 	  printf ("ERROR: asn1_get_length_der intnum (l %ld len %d)\n", l,
@@ -87,7 +96,9 @@ main (void)
       l = asn1_get_length_der (der, der_len, &len);
 
       if (l == -4L)
-	puts ("OK: asn1_get_length_der overflow-small");
+        {
+	  if (verbose) puts ("OK: asn1_get_length_der overflow-small");
+        }
       else
 	{
 	  printf ("ERROR: asn1_get_length_der overflow-small (l %ld len %d)\n", l,
@@ -111,7 +122,9 @@ main (void)
       l = asn1_get_length_der (der, der_len, &len);
 
       if (l == -4L)
-	puts ("OK: asn1_get_length_der overflow-large1");
+        {
+	  if (verbose) puts ("OK: asn1_get_length_der overflow-large1");
+        }
       else
 	{
 	  printf ("ERROR: asn1_get_length_der overflow-large1 (l %ld len %d)\n", l,
@@ -135,7 +148,9 @@ main (void)
       l = asn1_get_length_der (der, der_len, &len);
 
       if (l == -2L)
-	puts ("OK: asn1_get_length_der overflow-large2");
+        {
+	  if (verbose) puts ("OK: asn1_get_length_der overflow-large2");
+        }
       else
 	{
 	  printf ("ERROR: asn1_get_length_der overflow-large2 (l %ld len %d)\n", l,
diff --git a/tests/Test_parser.c b/tests/Test_parser.c
index 062fc2f..6b9ef70 100644
--- a/tests/Test_parser.c
+++ b/tests/Test_parser.c
@@ -152,15 +152,22 @@ main (int argc, char *argv[])
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   test_type *test;
   int errorCounter = 0, testCounter = 0;
+  int verbose = 0;
+  
+  if (argc > 1)
+    verbose = 1;
 
   fileCorrectName = getenv ("ASN1PARSER");
   if (!fileCorrectName)
     fileCorrectName = "Test_parser.asn";
 
-  printf ("\n\n/****************************************/\n");
-  printf ("/*     Test sequence : Test_parser      */\n");
-  printf ("/****************************************/\n\n");
-  printf ("ASN1PARSER: %s\n", fileCorrectName);
+  if (verbose != 0)
+    {
+      printf ("\n\n/****************************************/\n");
+      printf ("/*     Test sequence : Test_parser      */\n");
+      printf ("/****************************************/\n\n");
+      printf ("ASN1PARSER: %s\n", fileCorrectName);
+    }
 
   result = asn1_parser2tree (fileCorrectName, &definitions, errorDescription);
 
@@ -207,8 +214,11 @@ main (int argc, char *argv[])
     }
 
 
-  printf ("Total tests : %d\n", testCounter);
-  printf ("Total errors: %d\n", errorCounter);
+  if (verbose != 0)
+    {
+      printf ("Total tests : %d\n", testCounter);
+      printf ("Total errors: %d\n", errorCounter);
+    }
 
   if (errorCounter > 0)
     return 1;
diff --git a/tests/Test_tree.c b/tests/Test_tree.c
index 32c57e1..70b6df4 100644
--- a/tests/Test_tree.c
+++ b/tests/Test_tree.c
@@ -442,17 +442,23 @@ main (int argc, char *argv[])
   unsigned char value[1024], der[1024];
   int valueLen, tag = 0, class = 0;
   int k;
-  int start, end;
+  int start, end, verbose = 0;
   const char *str_p = NULL;
   const char *treefile = getenv ("ASN1TREE");
+  
+  if (argc > 1)
+    verbose = 1;
 
   if (!treefile)
     treefile = "Test_tree.asn";
 
-  printf ("\n\n/****************************************/\n");
-  printf ("/*     Test sequence : Test_tree        */\n");
-  printf ("/****************************************/\n\n");
-  printf ("ASN1TREE: %s\n", treefile);
+  if (verbose != 0)
+    {
+      printf ("\n\n/****************************************/\n");
+      printf ("/*     Test sequence : Test_tree        */\n");
+      printf ("/****************************************/\n\n");
+      printf ("ASN1TREE: %s\n", treefile);
+    }
 
   /* Check version */
   if (asn1_check_version ("0.2.11") == NULL)
@@ -571,16 +577,22 @@ main (int argc, char *argv[])
 	  str_p = asn1_find_structure_from_oid (definitions, test->par1);
 	  break;
 	case ACT_VISIT:
-	  asn1_print_structure (out, asn1_element, test->par1, test->par3);
-	  fprintf (out, "\n");
+	  if (verbose)
+	    {
+   	      asn1_print_structure (out, asn1_element, test->par1, test->par3);
+              fprintf (out, "\n");
+            }  
 	  result = ASN1_SUCCESS;
 	  break;
 	case ACT_PRINT_DER:
-	  printf ("DER encoding len:%i\n", der_len);
-	  printf ("DER encoding: ");
-	  for (k = 0; k < der_len; k++)
-	    printf ("%02x ", der[k]);
-	  printf ("\n\n");
+	  if (verbose)
+	    {
+              printf ("DER encoding len:%i\n", der_len);
+              printf ("DER encoding: ");
+              for (k = 0; k < der_len; k++)
+                printf ("%02x ", der[k]);
+	      printf ("\n\n");
+            }
 	  result = ASN1_SUCCESS;
 	  break;
 	case ACT_SET_DER:
@@ -757,9 +769,11 @@ main (int argc, char *argv[])
     }
 
 
-  printf ("Total tests : %d\n", testCounter);
-  printf ("Total errors: %d\n", errorCounter);
-
+  if (verbose != 0)
+    {
+      printf ("Total tests : %d\n", testCounter);
+      printf ("Total errors: %d\n", errorCounter);
+    }
 
   /* Clear the definition structures */
   asn1_delete_structure (&definitions);
diff --git a/tests/crlf b/tests/crlf
index be92dcf..7d74c8b 100755
--- a/tests/crlf
+++ b/tests/crlf
@@ -32,4 +32,4 @@ ASN1DECODING=../src/asn1Decoding${EXEEXT}
 $ASN1DECODING \
     $srcdir/../examples/pkix.asn \
     $srcdir/crlf.cer \
-    PKIX1Implicit88.Certificate
+    PKIX1Implicit88.Certificate >/dev/null


hooks/post-receive
-- 
GNU libtasn1


From MAILER-DAEMON Thu Oct 11 02:55:26 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TMCg2-0007ZU-6p
	for mharc-libtasn1-commit@gnu.org; Thu, 11 Oct 2012 02:55:26 -0400
Received: from eggs.gnu.org ([208.118.235.92]:38628)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TMCfq-0007ZA-V6
	for libtasn1-commit@gnu.org; Thu, 11 Oct 2012 02:55:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TMCfl-0005dN-Vp
	for libtasn1-commit@gnu.org; Thu, 11 Oct 2012 02:55:14 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:38210)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TMCfl-0005cq-Ps
	for libtasn1-commit@gnu.org; Thu, 11 Oct 2012 02:55:09 -0400
Received: from nmav by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TMCfl-0004ZL-0d
	for libtasn1-commit@gnu.org; Thu, 11 Oct 2012 06:55:09 +0000
Date: Thu, 11 Oct 2012 06:55:09 +0000
Message-Id: <E1TMCfl-0004ZL-0d@vcs.savannah.gnu.org>
From: "Nikos Mavrogiannopoulos" <nmav@gnutls.org>
To: libtasn1-commit@gnu.org
Subject: [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_13-50-g2f1c471
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 546930508edce93729d41c87901b20b2eb3631fc
X-Git-Newrev: 2f1c471fbcdbcedf69f914a5a3726107c156b17d
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libtasn1-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libtasn1 <libtasn1-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtasn1-commit>
List-Post: <mailto:libtasn1-commit@gnu.org>
List-Help: <mailto:libtasn1-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Oct 2012 06:55:24 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=2f1c471fbcdbcedf69f914a5a3726107c156b17d

The branch, master has been updated
       via  2f1c471fbcdbcedf69f914a5a3726107c156b17d (commit)
      from  546930508edce93729d41c87901b20b2eb3631fc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2f1c471fbcdbcedf69f914a5a3726107c156b17d
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Thu Oct 11 08:53:50 2012 +0200

    Renamed structures.
    
    Avoid using the reserved by POSIX _t. Suggested by Ivan Shmakov.
    asn1_static_node_t -> asn1_static_node
    asn1_node_t -> asn1_node

-----------------------------------------------------------------------

Summary of changes:
 NEWS                    |    4 +-
 doc/libtasn1.texi       |    6 ++--
 lib/ASN1.c              |    6 ++--
 lib/coding.c            |   22 +++++++-------
 lib/decoding.c          |   38 ++++++++++++------------
 lib/element.c           |   24 +++++++-------
 lib/element.h           |    4 +-
 lib/int.h               |    6 ++--
 lib/libtasn1.h          |   52 ++++++++++++++++----------------
 lib/parser_aux.c        |   74 +++++++++++++++++++++++-----------------------
 lib/parser_aux.h        |   56 ++++++++++++++++++------------------
 lib/structure.c         |   74 +++++++++++++++++++++++-----------------------
 lib/structure.h         |    8 ++--
 src/asn1Coding.c        |    4 +-
 src/asn1Decoding.c      |   10 +++---
 src/asn1Parser.c        |    2 +-
 tests/Test_encoding.c   |    4 +-
 tests/Test_indefinite.c |    4 +-
 tests/Test_parser.c     |    2 +-
 tests/Test_tree.c       |    4 +-
 20 files changed, 202 insertions(+), 202 deletions(-)

diff --git a/NEWS b/NEWS
index dc04286..d5c9297 100644
--- a/NEWS
+++ b/NEWS
@@ -8,8 +8,8 @@ GNU Libtasn1 NEWS                                     -*- outline -*-
 - libtasn1.h no longer exports internal structures.
 - Types were renamed for consistency:
   ASN1_DATA_NODE -> asn1_data_node_st
-  ASN1_ARRAY_TYPE -> asn1_static_node_t
-  ASN1_TYPE -> asn1_node_t
+  ASN1_ARRAY_TYPE -> asn1_static_node
+  ASN1_TYPE -> asn1_node
   ASN1_TYPE_EMPTY -> NULL
   static_struct_asn -> asn1_static_node_st
   node_asn_struct -> asn1_node_st
diff --git a/doc/libtasn1.texi b/doc/libtasn1.texi
index 3268914..13238aa 100644
--- a/doc/libtasn1.texi
+++ b/doc/libtasn1.texi
@@ -229,16 +229,16 @@ The name "?LAST" indicates the last element of a @code{SET_OF} or
 
 The header file of this library is @file{libtasn1.h}.
 
-@cindex Main type asn1_node_t
+@cindex Main type asn1_node
 
-The main type used in it is @code{asn1_node_t}, and it's used to store
+The main type used in it is @code{asn1_node}, and it's used to store
 the ASN.1 definitions and structures (instances).
 
 The constant @code{NULL} can be used for the variable
 initialization.  For example:
 
 @example
- asn1_node_t definitions=NULL;
+ asn1_node definitions=NULL;
 @end example
 
 Some functions require a parameter named errorDescription of char*
diff --git a/lib/ASN1.c b/lib/ASN1.c
index 179d762..1aaca9a 100644
--- a/lib/ASN1.c
+++ b/lib/ASN1.c
@@ -111,7 +111,7 @@
 static FILE *file_asn1;			/* Pointer to file to parse */
 static int result_parse;	/* result of the parser
 					   algorithm */
-static asn1_node_t p_tree;		/* pointer to the root of the
+static asn1_node p_tree;		/* pointer to the root of the
 					   structure created by the
 					   parser*/
 static unsigned long lineNumber;	/* line number describing the
@@ -248,7 +248,7 @@ typedef union YYSTYPE
 
   unsigned int constant;
   char str[ASN1_MAX_NAME_SIZE+1];
-  asn1_node_t node;
+  asn1_node node;
 
 
 
@@ -2822,7 +2822,7 @@ _asn1_create_errorDescription(int error,char *errorDescription)
  *   characters.
  **/
 int
-asn1_parser2tree(const char *file_name, asn1_node_t *definitions,
+asn1_parser2tree(const char *file_name, asn1_node *definitions,
 		 char *errorDescription) 
 {
 
diff --git a/lib/coding.c b/lib/coding.c
index 3cbcd8a..581ef96 100644
--- a/lib/coding.c
+++ b/lib/coding.c
@@ -44,7 +44,7 @@
 /* Return:                                            */
 /******************************************************/
 static void
-_asn1_error_description_value_not_found (asn1_node_t node,
+_asn1_error_description_value_not_found (asn1_node node,
 					 char *ErrorDescription)
 {
 
@@ -373,10 +373,10 @@ asn1_bit_der (const unsigned char *str, int bit_len,
 /*   otherwise ASN1_SUCCESS.                          */
 /******************************************************/
 static int
-_asn1_complete_explicit_tag (asn1_node_t node, unsigned char *der,
+_asn1_complete_explicit_tag (asn1_node node, unsigned char *der,
 			     int *counter, int *max_len)
 {
-  asn1_node_t p;
+  asn1_node p;
   int is_tag_implicit, len2, len3;
   unsigned char temp[SIZEOF_UNSIGNED_INT];
 
@@ -446,10 +446,10 @@ _asn1_complete_explicit_tag (asn1_node_t node, unsigned char *der,
 /*   otherwise ASN1_SUCCESS.                          */
 /******************************************************/
 static int
-_asn1_insert_tag_der (asn1_node_t node, unsigned char *der, int *counter,
+_asn1_insert_tag_der (asn1_node node, unsigned char *der, int *counter,
 		      int *max_len)
 {
-  asn1_node_t p;
+  asn1_node p;
   int tag_len, is_tag_implicit;
   unsigned char class, class_implicit = 0, temp[SIZEOF_UNSIGNED_INT * 3 + 1];
   unsigned long tag_implicit = 0;
@@ -607,7 +607,7 @@ _asn1_insert_tag_der (asn1_node_t node, unsigned char *der, int *counter,
 /* Return:                                            */
 /******************************************************/
 static void
-_asn1_ordering_set (unsigned char *der, int der_len, asn1_node_t node)
+_asn1_ordering_set (unsigned char *der, int der_len, asn1_node node)
 {
   struct vet
   {
@@ -618,7 +618,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, asn1_node_t node)
 
   int counter, len, len2;
   struct vet *first, *last, *p_vet, *p2_vet;
-  asn1_node_t p;
+  asn1_node p;
   unsigned char class, *temp;
   unsigned long tag;
 
@@ -721,7 +721,7 @@ _asn1_ordering_set (unsigned char *der, int der_len, asn1_node_t node)
 /* Return:                                            */
 /******************************************************/
 static void
-_asn1_ordering_set_of (unsigned char *der, int der_len, asn1_node_t node)
+_asn1_ordering_set_of (unsigned char *der, int der_len, asn1_node node)
 {
   struct vet
   {
@@ -731,7 +731,7 @@ _asn1_ordering_set_of (unsigned char *der, int der_len, asn1_node_t node)
 
   int counter, len, len2, change;
   struct vet *first, *last, *p_vet, *p2_vet;
-  asn1_node_t p;
+  asn1_node p;
   unsigned char *temp, class;
   unsigned long k, max;
 
@@ -867,10 +867,10 @@ _asn1_ordering_set_of (unsigned char *der, int der_len, asn1_node_t node)
  *   length needed.
  **/
 int
-asn1_der_coding (asn1_node_t element, const char *name, void *ider, int *len,
+asn1_der_coding (asn1_node element, const char *name, void *ider, int *len,
 		 char *ErrorDescription)
 {
-  asn1_node_t node, p, p2;
+  asn1_node node, p, p2;
   unsigned char temp[SIZEOF_UNSIGNED_LONG_INT * 3 + 1];
   int counter, counter_old, len2, len3, tlen, move, max_len, max_len_old;
   int err;
diff --git a/lib/decoding.c b/lib/decoding.c
index 4373a1d..79766a1 100644
--- a/lib/decoding.c
+++ b/lib/decoding.c
@@ -36,7 +36,7 @@ static int
 _asn1_get_indefinite_length_string (const unsigned char *der, int *len);
 
 static void
-_asn1_error_description_tag_error (asn1_node_t node, char *ErrorDescription)
+_asn1_error_description_tag_error (asn1_node node, char *ErrorDescription)
 {
 
   Estrcpy (ErrorDescription, ":: tag error near element '");
@@ -369,10 +369,10 @@ asn1_get_bit_der (const unsigned char *der, int der_len,
 }
 
 static int
-_asn1_extract_tag_der (asn1_node_t node, const unsigned char *der, int der_len,
+_asn1_extract_tag_der (asn1_node node, const unsigned char *der, int der_len,
 		       int *ret_len)
 {
-  asn1_node_t p;
+  asn1_node p;
   int counter, len2, len3, is_tag_implicit;
   unsigned long tag, tag_implicit = 0;
   unsigned char class, class2, class_implicit = 0;
@@ -567,9 +567,9 @@ _asn1_extract_tag_der (asn1_node_t node, const unsigned char *der, int der_len,
 }
 
 static int
-_asn1_delete_not_used (asn1_node_t node)
+_asn1_delete_not_used (asn1_node node)
 {
-  asn1_node_t p, p2;
+  asn1_node p, p2;
 
   if (node == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
@@ -626,7 +626,7 @@ _asn1_delete_not_used (asn1_node_t node)
 }
 
 static int
-_asn1_extract_der_octet (asn1_node_t node, const unsigned char *der,
+_asn1_extract_der_octet (asn1_node node, const unsigned char *der,
 			 int der_len)
 {
   int len2, len3;
@@ -671,7 +671,7 @@ _asn1_extract_der_octet (asn1_node_t node, const unsigned char *der,
 }
 
 static int
-_asn1_get_octet_string (const unsigned char *der, asn1_node_t node, int *len)
+_asn1_get_octet_string (const unsigned char *der, asn1_node node, int *len)
 {
   int len2, len3, counter, tot_len, indefinite;
 
@@ -820,10 +820,10 @@ _asn1_get_indefinite_length_string (const unsigned char *der, int *len)
  *   name (*@ELEMENT deleted).
  **/
 int
-asn1_der_decoding (asn1_node_t * element, const void *ider, int len,
+asn1_der_decoding (asn1_node * element, const void *ider, int len,
 		   char *errorDescription)
 {
-  asn1_node_t node, p, p2, p3;
+  asn1_node node, p, p2, p3;
   char temp[128];
   int counter, len2, len3, len4, move, ris, tlen;
   unsigned char class;
@@ -1401,10 +1401,10 @@ cleanup:
  *   match the structure @structure (*ELEMENT deleted).
  **/
 int
-asn1_der_decoding_element (asn1_node_t * structure, const char *elementName,
+asn1_der_decoding_element (asn1_node * structure, const char *elementName,
 			   const void *ider, int len, char *errorDescription)
 {
-  asn1_node_t node, p, p2, p3, nodeFound = NULL;
+  asn1_node node, p, p2, p3, nodeFound = NULL;
   char temp[128], currentName[ASN1_MAX_NAME_SIZE * 10], *dot_p, *char_p;
   int nameLen = ASN1_MAX_NAME_SIZE * 10 - 1, state;
   int counter, len2, len3, len4, move, ris, tlen;
@@ -2210,15 +2210,15 @@ cleanup:
  * certificate.
  *
  * Returns: %ASN1_SUCCESS if DER encoding OK, %ASN1_ELEMENT_NOT_FOUND
- *   if ELEMENT is %asn1_node_t EMPTY or @name_element is not a valid
+ *   if ELEMENT is %asn1_node EMPTY or @name_element is not a valid
  *   element, %ASN1_TAG_ERROR or %ASN1_DER_ERROR if the der encoding
  *   doesn't match the structure ELEMENT.
  **/
 int
-asn1_der_decoding_startEnd (asn1_node_t element, const void *ider, int len,
+asn1_der_decoding_startEnd (asn1_node element, const void *ider, int len,
 			    const char *name_element, int *start, int *end)
 {
-  asn1_node_t node, node_to_find, p, p2, p3;
+  asn1_node node, node_to_find, p, p2, p3;
   int counter, len2, len3, len4, move, ris;
   unsigned char class;
   unsigned long tag;
@@ -2566,13 +2566,13 @@ asn1_der_decoding_startEnd (asn1_node_t element, const void *ider, int len,
  *   depending on DER decoding.
  **/
 int
-asn1_expand_any_defined_by (asn1_node_t definitions, asn1_node_t * element)
+asn1_expand_any_defined_by (asn1_node definitions, asn1_node * element)
 {
   char definitionsName[ASN1_MAX_NAME_SIZE], name[2 * ASN1_MAX_NAME_SIZE + 1],
     value[ASN1_MAX_NAME_SIZE];
   int retCode = ASN1_SUCCESS, result;
   int len, len2, len3;
-  asn1_node_t p, p2, p3, aux = NULL;
+  asn1_node p, p2, p3, aux = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
 
   if ((definitions == NULL) || (*element == NULL))
@@ -2796,14 +2796,14 @@ asn1_expand_any_defined_by (asn1_node_t definitions, asn1_node_t * element)
  *   use for expansion, or other errors depending on DER decoding.
  **/
 int
-asn1_expand_octet_string (asn1_node_t definitions, asn1_node_t * element,
+asn1_expand_octet_string (asn1_node definitions, asn1_node * element,
 			  const char *octetName, const char *objectName)
 {
   char name[2 * ASN1_MAX_NAME_SIZE + 1], value[ASN1_MAX_NAME_SIZE];
   int retCode = ASN1_SUCCESS, result;
   int len, len2, len3;
-  asn1_node_t p2, aux = NULL;
-  asn1_node_t octetNode = NULL, objectNode = NULL;
+  asn1_node p2, aux = NULL;
+  asn1_node octetNode = NULL, objectNode = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
 
   if ((definitions == NULL) || (*element == NULL))
diff --git a/lib/element.c b/lib/element.c
index 6105620..4c871a1 100644
--- a/lib/element.c
+++ b/lib/element.c
@@ -34,9 +34,9 @@
 #include "element.h"
 
 void
-_asn1_hierarchical_name (asn1_node_t node, char *name, int name_size)
+_asn1_hierarchical_name (asn1_node node, char *name, int name_size)
 {
-  asn1_node_t p;
+  asn1_node p;
   char tmp_name[64];
 
   p = node;
@@ -127,9 +127,9 @@ _asn1_convert_integer (const unsigned char *value, unsigned char *value_out,
 
 
 int
-_asn1_append_sequence_set (asn1_node_t node)
+_asn1_append_sequence_set (asn1_node node)
 {
-  asn1_node_t p, p2;
+  asn1_node p, p2;
   char temp[10];
   long n;
 
@@ -268,10 +268,10 @@ _asn1_append_sequence_set (asn1_node_t node)
  *   %ASN1_VALUE_NOT_VALID if @ivalue has a wrong format.
  **/
 int
-asn1_write_value (asn1_node_t node_root, const char *name,
+asn1_write_value (asn1_node node_root, const char *name,
 		  const void *ivalue, int len)
 {
-  asn1_node_t node, p, p2;
+  asn1_node node, p, p2;
   unsigned char *temp, *value_temp = NULL, *default_temp = NULL;
   int len2, k, k2, negative;
   size_t i;
@@ -694,9 +694,9 @@ asn1_write_value (asn1_node_t node_root, const char *name,
  *   bytes needed.
  **/
 int
-asn1_read_value (asn1_node_t root, const char *name, void *ivalue, int *len)
+asn1_read_value (asn1_node root, const char *name, void *ivalue, int *len)
 {
-  asn1_node_t node, p, p2;
+  asn1_node node, p, p2;
   int len2, len3;
   int value_size = *len;
   unsigned char *value = ivalue;
@@ -872,10 +872,10 @@ asn1_read_value (asn1_node_t root, const char *name, void *ivalue, int *len)
  *   @name is not a valid element.
  **/
 int
-asn1_read_tag (asn1_node_t root, const char *name, int *tagValue,
+asn1_read_tag (asn1_node root, const char *name, int *tagValue,
 	       int *classValue)
 {
-  asn1_node_t node, p, pTag;
+  asn1_node node, p, pTag;
 
   node = asn1_find_node (root, name);
   if (node == NULL)
@@ -976,12 +976,12 @@ asn1_read_tag (asn1_node_t root, const char *name, int *tagValue,
  * @node: pointer to a node.
  * @data: a point to a asn1_data_node_st
  *
- * Returns the value a data node inside a asn1_node_t structure.
+ * Returns the value a data node inside a asn1_node structure.
  * The data returned should be handled as constant values.
  *
  * Returns: %ASN1_SUCCESS if the node exists.
  **/
-int asn1_read_node_value (asn1_node_t node, asn1_data_node_st* data)
+int asn1_read_node_value (asn1_node node, asn1_data_node_st* data)
 {
   data->name = node->name;
   data->value = node->value;
diff --git a/lib/element.h b/lib/element.h
index ee07837..3bd38bb 100644
--- a/lib/element.h
+++ b/lib/element.h
@@ -23,12 +23,12 @@
 #define _ELEMENT_H
 
 
-int _asn1_append_sequence_set (asn1_node_t node);
+int _asn1_append_sequence_set (asn1_node node);
 
 int _asn1_convert_integer (const unsigned char *value,
 				    unsigned char *value_out,
 				    int value_out_size, int *len);
 
-void _asn1_hierarchical_name (asn1_node_t node, char *name, int name_size);
+void _asn1_hierarchical_name (asn1_node node, char *name, int name_size);
 
 #endif
diff --git a/lib/int.h b/lib/int.h
index 696fb70..0908284 100644
--- a/lib/int.h
+++ b/lib/int.h
@@ -51,9 +51,9 @@ struct asn1_node_st
   unsigned int type;		/* Node type */
   unsigned char *value;		/* Node value */
   int value_len;
-  asn1_node_t down;		/* Pointer to the son node */
-  asn1_node_t right;		/* Pointer to the brother node */
-  asn1_node_t left;		/* Pointer to the next list element */
+  asn1_node down;		/* Pointer to the son node */
+  asn1_node right;		/* Pointer to the brother node */
+  asn1_node left;		/* Pointer to the next list element */
   /* private fields: */
   unsigned char small_value[ASN1_SMALL_VALUE_SIZE];	/* For small values */
 };
diff --git a/lib/libtasn1.h b/lib/libtasn1.h
index a75b554..5be46d0 100644
--- a/lib/libtasn1.h
+++ b/lib/libtasn1.h
@@ -108,7 +108,7 @@ extern "C"
 
   typedef struct asn1_node_st asn1_node_st;
 
-  typedef asn1_node_st *asn1_node_t;
+  typedef asn1_node_st *asn1_node;
 
   /* maximum number of characters of a name */
   /* inside a file with ASN1 definitons     */
@@ -175,7 +175,7 @@ extern "C"
 
   extern ASN1_API int
     asn1_parser2tree (const char *file_name,
-		      asn1_node_t * definitions, char *errorDescription);
+		      asn1_node * definitions, char *errorDescription);
 
   extern ASN1_API int
     asn1_parser2array (const char *inputFileName,
@@ -184,68 +184,68 @@ extern "C"
 
   extern ASN1_API int
     asn1_array2tree (const asn1_static_node_t * array,
-		     asn1_node_t * definitions, char *errorDescription);
+		     asn1_node * definitions, char *errorDescription);
 
   extern ASN1_API void
-    asn1_print_structure (FILE * out, asn1_node_t structure,
+    asn1_print_structure (FILE * out, asn1_node structure,
 			  const char *name, int mode);
 
   extern ASN1_API int
-    asn1_create_element (asn1_node_t definitions,
-			 const char *source_name, asn1_node_t * element);
+    asn1_create_element (asn1_node definitions,
+			 const char *source_name, asn1_node * element);
 
-  extern ASN1_API int asn1_delete_structure (asn1_node_t * structure);
+  extern ASN1_API int asn1_delete_structure (asn1_node * structure);
 
   extern ASN1_API int
-    asn1_delete_element (asn1_node_t structure, const char *element_name);
+    asn1_delete_element (asn1_node structure, const char *element_name);
 
   extern ASN1_API int
-    asn1_write_value (asn1_node_t node_root, const char *name,
+    asn1_write_value (asn1_node node_root, const char *name,
 		      const void *ivalue, int len);
 
   extern ASN1_API int
-    asn1_read_value (asn1_node_t root, const char *name,
+    asn1_read_value (asn1_node root, const char *name,
 		     void *ivalue, int *len);
 
   extern ASN1_API int
-    asn1_read_node_value (asn1_node_t node, asn1_data_node_st* data);
+    asn1_read_node_value (asn1_node node, asn1_data_node_st* data);
 
   extern ASN1_API int
-    asn1_number_of_elements (asn1_node_t element, const char *name, int *num);
+    asn1_number_of_elements (asn1_node element, const char *name, int *num);
 
   extern ASN1_API int
-    asn1_der_coding (asn1_node_t element, const char *name,
+    asn1_der_coding (asn1_node element, const char *name,
 		     void *ider, int *len, char *ErrorDescription);
 
   extern ASN1_API int
-    asn1_der_decoding (asn1_node_t * element, const void *ider,
+    asn1_der_decoding (asn1_node * element, const void *ider,
 		       int len, char *errorDescription);
 
   extern ASN1_API int
-    asn1_der_decoding_element (asn1_node_t * structure,
+    asn1_der_decoding_element (asn1_node * structure,
 			       const char *elementName,
 			       const void *ider, int len,
 			       char *errorDescription);
 
   extern ASN1_API int
-    asn1_der_decoding_startEnd (asn1_node_t element,
+    asn1_der_decoding_startEnd (asn1_node element,
 				const void *ider, int len,
 				const char *name_element,
 				int *start, int *end);
 
   extern ASN1_API int
-    asn1_expand_any_defined_by (asn1_node_t definitions, asn1_node_t * element);
+    asn1_expand_any_defined_by (asn1_node definitions, asn1_node * element);
 
   extern ASN1_API int
-    asn1_expand_octet_string (asn1_node_t definitions,
-			      asn1_node_t * element,
+    asn1_expand_octet_string (asn1_node definitions,
+			      asn1_node * element,
 			      const char *octetName, const char *objectName);
 
   extern ASN1_API int
-    asn1_read_tag (asn1_node_t root, const char *name,
+    asn1_read_tag (asn1_node root, const char *name,
 		   int *tagValue, int *classValue);
 
-  extern ASN1_API const char *asn1_find_structure_from_oid (asn1_node_t
+  extern ASN1_API const char *asn1_find_structure_from_oid (asn1_node
 							    definitions,
 							    const char
 							    *oidValue);
@@ -290,12 +290,12 @@ extern "C"
 
   /* Other utility functions. */
 
-  extern ASN1_API asn1_node_t
-    asn1_find_node (asn1_node_t pointer, const char *name);
+  extern ASN1_API asn1_node
+    asn1_find_node (asn1_node pointer, const char *name);
 
   extern ASN1_API int
-    asn1_copy_node (asn1_node_t dst, const char *dst_name,
-		    asn1_node_t src, const char *src_name);
+    asn1_copy_node (asn1_node dst, const char *dst_name,
+		    asn1_node src, const char *src_name);
 
 /* Compatibility types */
 
@@ -303,7 +303,7 @@ typedef int asn1_retCode;	/* type returned by libtasn1 functions */
 
 #define node_asn_struct asn1_node_st
 #define node_asn asn1_node_st
-#define ASN1_TYPE asn1_node_t
+#define ASN1_TYPE asn1_node
 #define ASN1_TYPE_EMPTY NULL
 
 #define static_struct_asn asn1_static_node_st
diff --git a/lib/parser_aux.c b/lib/parser_aux.c
index 9e792fd..96ecac6 100644
--- a/lib/parser_aux.c
+++ b/lib/parser_aux.c
@@ -35,7 +35,7 @@ char _asn1_identifierMissing[ASN1_MAX_NAME_SIZE + 1];	/* identifier name not fou
 /***********************************************/
 typedef struct list_struct
 {
-  asn1_node_t node;
+  asn1_node node;
   struct list_struct *next;
 } list_type;
 
@@ -52,11 +52,11 @@ list_type *firstElement = NULL;
 /*         and CONST_ constants).                     */
 /* Return: pointer to the new element.                */
 /******************************************************/
-asn1_node_t
+asn1_node
 _asn1_add_static_node (unsigned int type)
 {
   list_type *listElement;
-  asn1_node_t punt;
+  asn1_node punt;
 
   punt = calloc (1, sizeof (struct asn1_node_st));
   if (punt == NULL)
@@ -90,10 +90,10 @@ _asn1_add_static_node (unsigned int type)
  *
  * Returns: the search result, or %NULL if not found.
  **/
-asn1_node_t
-asn1_find_node (asn1_node_t pointer, const char *name)
+asn1_node
+asn1_find_node (asn1_node pointer, const char *name)
 {
-  asn1_node_t p;
+  asn1_node p;
   char *n_end, n[ASN1_MAX_NAME_SIZE + 1];
   const char *n_start;
   unsigned int nsize;
@@ -208,8 +208,8 @@ asn1_find_node (asn1_node_t pointer, const char *name)
 /*   len: character number of value.                              */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-asn1_node_t
-_asn1_set_value (asn1_node_t node, const void *value, unsigned int len)
+asn1_node
+_asn1_set_value (asn1_node node, const void *value, unsigned int len)
 {
   if (node == NULL)
     return node;
@@ -251,8 +251,8 @@ _asn1_set_value (asn1_node_t node, const void *value, unsigned int len)
 /*   len: character number of value.                              */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-asn1_node_t
-_asn1_set_value_octet (asn1_node_t node, const void *value, unsigned int len)
+asn1_node
+_asn1_set_value_octet (asn1_node node, const void *value, unsigned int len)
 {
   int len2;
   void *temp;
@@ -272,8 +272,8 @@ _asn1_set_value_octet (asn1_node_t node, const void *value, unsigned int len)
 /* the same as _asn1_set_value except that it sets an already malloc'ed
  * value.
  */
-asn1_node_t
-_asn1_set_value_m (asn1_node_t node, void *value, unsigned int len)
+asn1_node
+_asn1_set_value_m (asn1_node node, void *value, unsigned int len)
 {
   if (node == NULL)
     return node;
@@ -305,8 +305,8 @@ _asn1_set_value_m (asn1_node_t node, void *value, unsigned int len)
 /*   len: character number of value.                              */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-asn1_node_t
-_asn1_append_value (asn1_node_t node, const void *value, unsigned int len)
+asn1_node
+_asn1_append_value (asn1_node node, const void *value, unsigned int len)
 {
   if (node == NULL)
     return node;
@@ -355,8 +355,8 @@ _asn1_append_value (asn1_node_t node, const void *value, unsigned int len)
 /*         to set.                                                */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-asn1_node_t
-_asn1_set_name (asn1_node_t node, const char *name)
+asn1_node
+_asn1_set_name (asn1_node node, const char *name)
 {
 unsigned int nsize;
 
@@ -384,8 +384,8 @@ unsigned int nsize;
 /*   src: a source element pointer.                               */
 /* Return: pointer to the NODE_ASN element.                       */
 /******************************************************************/
-asn1_node_t
-_asn1_cpy_name (asn1_node_t dst, asn1_node_t src)
+asn1_node
+_asn1_cpy_name (asn1_node dst, asn1_node src)
 {
   if (dst == NULL)
     return dst;
@@ -412,8 +412,8 @@ _asn1_cpy_name (asn1_node_t dst, asn1_node_t src)
 /*          by NODE.                                              */
 /* Return: pointer to *NODE.                                      */
 /******************************************************************/
-asn1_node_t
-_asn1_set_right (asn1_node_t node, asn1_node_t right)
+asn1_node
+_asn1_set_right (asn1_node node, asn1_node right)
 {
   if (node == NULL)
     return node;
@@ -431,10 +431,10 @@ _asn1_set_right (asn1_node_t node, asn1_node_t right)
 /*   node: starting element pointer.                              */
 /* Return: pointer to the last element along the right chain.     */
 /******************************************************************/
-asn1_node_t
-_asn1_get_last_right (asn1_node_t node)
+asn1_node
+_asn1_get_last_right (asn1_node node)
 {
-  asn1_node_t p;
+  asn1_node p;
 
   if (node == NULL)
     return NULL;
@@ -452,7 +452,7 @@ _asn1_get_last_right (asn1_node_t node)
 /*   node: NODE_ASN element pointer.                              */
 /******************************************************************/
 void
-_asn1_remove_node (asn1_node_t node)
+_asn1_remove_node (asn1_node node)
 {
   if (node == NULL)
     return;
@@ -469,10 +469,10 @@ _asn1_remove_node (asn1_node_t node)
 /*   node: NODE_ASN element pointer.                              */
 /* Return: Null if not found.                                     */
 /******************************************************************/
-asn1_node_t
-_asn1_find_up (asn1_node_t node)
+asn1_node
+_asn1_find_up (asn1_node node)
 {
-  asn1_node_t p;
+  asn1_node p;
 
   if (node == NULL)
     return NULL;
@@ -568,9 +568,9 @@ _asn1_ltostr (long v, char *str)
 /*   otherwise ASN1_SUCCESS                                             */
 /******************************************************************/
 int
-_asn1_change_integer_value (asn1_node_t node)
+_asn1_change_integer_value (asn1_node node)
 {
-  asn1_node_t p;
+  asn1_node p;
   unsigned char val[SIZEOF_UNSIGNED_LONG_INT];
   unsigned char val2[SIZEOF_UNSIGNED_LONG_INT + 1];
   int len;
@@ -635,9 +635,9 @@ _asn1_change_integer_value (asn1_node_t node)
 /*   otherwise ASN1_SUCCESS                                             */
 /******************************************************************/
 int
-_asn1_expand_object_id (asn1_node_t node)
+_asn1_expand_object_id (asn1_node node)
 {
-  asn1_node_t p, p2, p3, p4, p5;
+  asn1_node p, p2, p3, p4, p5;
   char name_root[ASN1_MAX_NAME_SIZE], name2[2 * ASN1_MAX_NAME_SIZE + 1];
   int move, tlen;
 
@@ -818,9 +818,9 @@ _asn1_expand_object_id (asn1_node_t node)
 /*   otherwise ASN1_SUCCESS                                             */
 /******************************************************************/
 int
-_asn1_type_set_config (asn1_node_t node)
+_asn1_type_set_config (asn1_node node)
 {
-  asn1_node_t p, p2;
+  asn1_node p, p2;
   int move;
 
   if (node == NULL)
@@ -891,9 +891,9 @@ _asn1_type_set_config (asn1_node_t node)
 /*   otherwise ASN1_SUCCESS                                       */
 /******************************************************************/
 int
-_asn1_check_identifier (asn1_node_t node)
+_asn1_check_identifier (asn1_node node)
 {
-  asn1_node_t p, p2;
+  asn1_node p, p2;
   char name2[ASN1_MAX_NAME_SIZE * 2 + 2];
 
   if (node == NULL)
@@ -998,9 +998,9 @@ _asn1_check_identifier (asn1_node_t node)
 /*   otherwise ASN1_SUCCESS                                       */
 /******************************************************************/
 int
-_asn1_set_default_tag (asn1_node_t node)
+_asn1_set_default_tag (asn1_node node)
 {
-  asn1_node_t p;
+  asn1_node p;
 
   if ((node == NULL) || (type_field (node->type) != TYPE_DEFINITIONS))
     return ASN1_ELEMENT_NOT_FOUND;
diff --git a/lib/parser_aux.h b/lib/parser_aux.h
index 8838866..df369c7 100644
--- a/lib/parser_aux.h
+++ b/lib/parser_aux.h
@@ -27,28 +27,28 @@
 /***************************************/
 /*  Functions used by ASN.1 parser     */
 /***************************************/
-asn1_node_t _asn1_add_static_node (unsigned int type);
+asn1_node _asn1_add_static_node (unsigned int type);
 
-asn1_node_t
-_asn1_set_value (asn1_node_t node, const void *value, unsigned int len);
+asn1_node
+_asn1_set_value (asn1_node node, const void *value, unsigned int len);
 
-asn1_node_t _asn1_set_value_m (asn1_node_t node, void *value, unsigned int len);
+asn1_node _asn1_set_value_m (asn1_node node, void *value, unsigned int len);
 
-asn1_node_t
-_asn1_set_value_octet (asn1_node_t node, const void *value, unsigned int len);
+asn1_node
+_asn1_set_value_octet (asn1_node node, const void *value, unsigned int len);
 
-asn1_node_t
-_asn1_append_value (asn1_node_t node, const void *value, unsigned int len);
+asn1_node
+_asn1_append_value (asn1_node node, const void *value, unsigned int len);
 
-asn1_node_t _asn1_set_name (asn1_node_t node, const char *name);
+asn1_node _asn1_set_name (asn1_node node, const char *name);
 
-asn1_node_t _asn1_cpy_name (asn1_node_t dst, asn1_node_t src);
+asn1_node _asn1_cpy_name (asn1_node dst, asn1_node src);
 
-asn1_node_t _asn1_set_right (asn1_node_t node, asn1_node_t right);
+asn1_node _asn1_set_right (asn1_node node, asn1_node right);
 
-asn1_node_t _asn1_get_last_right (asn1_node_t node);
+asn1_node _asn1_get_last_right (asn1_node node);
 
-void _asn1_remove_node (asn1_node_t node);
+void _asn1_remove_node (asn1_node node);
 
 void _asn1_delete_list (void);
 
@@ -56,17 +56,17 @@ void _asn1_delete_list_and_nodes (void);
 
 char *_asn1_ltostr (long v, char *str);
 
-asn1_node_t _asn1_find_up (asn1_node_t node);
+asn1_node _asn1_find_up (asn1_node node);
 
-int _asn1_change_integer_value (asn1_node_t node);
+int _asn1_change_integer_value (asn1_node node);
 
-int _asn1_expand_object_id (asn1_node_t node);
+int _asn1_expand_object_id (asn1_node node);
 
-int _asn1_type_set_config (asn1_node_t node);
+int _asn1_type_set_config (asn1_node node);
 
-int _asn1_check_identifier (asn1_node_t node);
+int _asn1_check_identifier (asn1_node node);
 
-int _asn1_set_default_tag (asn1_node_t node);
+int _asn1_set_default_tag (asn1_node node);
 
 /******************************************************************/
 /* Function : _asn1_get_right                                     */
@@ -76,8 +76,8 @@ int _asn1_set_default_tag (asn1_node_t node);
 /*   node: NODE_ASN element pointer.                              */
 /* Return: field RIGHT of NODE.                                   */
 /******************************************************************/
-inline static asn1_node_t
-_asn1_get_right (asn1_node_t node)
+inline static asn1_node
+_asn1_get_right (asn1_node node)
 {
   if (node == NULL)
     return NULL;
@@ -93,8 +93,8 @@ _asn1_get_right (asn1_node_t node)
 /*          by NODE.                                              */
 /* Return: pointer to *NODE.                                      */
 /******************************************************************/
-inline static asn1_node_t
-_asn1_set_down (asn1_node_t node, asn1_node_t down)
+inline static asn1_node
+_asn1_set_down (asn1_node node, asn1_node down)
 {
   if (node == NULL)
     return node;
@@ -112,8 +112,8 @@ _asn1_set_down (asn1_node_t node, asn1_node_t down)
 /*   node: NODE_ASN element pointer.                              */
 /* Return: field DOWN of NODE.                                    */
 /******************************************************************/
-inline static asn1_node_t
-_asn1_get_down (asn1_node_t node)
+inline static asn1_node
+_asn1_get_down (asn1_node node)
 {
   if (node == NULL)
     return NULL;
@@ -128,7 +128,7 @@ _asn1_get_down (asn1_node_t node)
 /* Return: a null terminated string.                              */
 /******************************************************************/
 inline static char *
-_asn1_get_name (asn1_node_t node)
+_asn1_get_name (asn1_node node)
 {
   if (node == NULL)
     return NULL;
@@ -146,8 +146,8 @@ _asn1_get_name (asn1_node_t node)
 /*          value of field TYPE.                                  */
 /* Return: NODE pointer.                                          */
 /******************************************************************/
-inline static asn1_node_t
-_asn1_mod_type (asn1_node_t node, unsigned int value)
+inline static asn1_node
+_asn1_mod_type (asn1_node node, unsigned int value)
 {
   if (node == NULL)
     return node;
diff --git a/lib/structure.c b/lib/structure.c
index 3eb562f..4613d06 100644
--- a/lib/structure.c
+++ b/lib/structure.c
@@ -44,10 +44,10 @@ extern char _asn1_identifierMissing[];
 /*         and CONST_ constants).                     */
 /* Return: pointer to the new element.                */
 /******************************************************/
-asn1_node_t
+asn1_node
 _asn1_add_single_node (unsigned int type)
 {
-  asn1_node_t punt;
+  asn1_node punt;
 
   punt = calloc (1, sizeof (struct asn1_node_st));
   if (punt == NULL)
@@ -67,8 +67,8 @@ _asn1_add_single_node (unsigned int type)
 /*   node: NODE_ASN element pointer.                              */
 /* Return: NULL if not found.                                     */
 /******************************************************************/
-asn1_node_t
-_asn1_find_left (asn1_node_t node)
+asn1_node
+_asn1_find_left (asn1_node node)
 {
   if ((node == NULL) || (node->left == NULL) || (node->left->down == node))
     return NULL;
@@ -78,11 +78,11 @@ _asn1_find_left (asn1_node_t node)
 
 
 int
-_asn1_create_static_structure (asn1_node_t pointer, char *output_file_name,
+_asn1_create_static_structure (asn1_node pointer, char *output_file_name,
 			       char *vector_name)
 {
   FILE *file;
-  asn1_node_t p;
+  asn1_node p;
   unsigned long t;
 
   file = fopen (output_file_name, "w");
@@ -174,10 +174,10 @@ _asn1_create_static_structure (asn1_node_t 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_t * definitions,
+asn1_array2tree (const asn1_static_node_t * array, asn1_node * definitions,
 		 char *errorDescription)
 {
-  asn1_node_t p, p_last = NULL;
+  asn1_node p, p_last = NULL;
   unsigned long k;
   int move;
   int result;
@@ -282,9 +282,9 @@ asn1_array2tree (const asn1_static_node_t * array, asn1_node_t * definitions,
  *   *@structure was NULL.
  **/
 int
-asn1_delete_structure (asn1_node_t * structure)
+asn1_delete_structure (asn1_node * structure)
 {
-  asn1_node_t p, p2, p3;
+  asn1_node p, p2, p3;
 
   if (*structure == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
@@ -346,9 +346,9 @@ asn1_delete_structure (asn1_node_t * structure)
  *   the @element_name was not found.
  **/
 int
-asn1_delete_element (asn1_node_t structure, const char *element_name)
+asn1_delete_element (asn1_node structure, const char *element_name)
 {
-  asn1_node_t p2, p3, source_node;
+  asn1_node p2, p3, source_node;
 
   source_node = asn1_find_node (structure, element_name);
 
@@ -371,10 +371,10 @@ asn1_delete_element (asn1_node_t structure, const char *element_name)
   return asn1_delete_structure (&source_node);
 }
 
-asn1_node_t
-_asn1_copy_structure3 (asn1_node_t source_node)
+asn1_node
+_asn1_copy_structure3 (asn1_node source_node)
 {
-  asn1_node_t dest_node, p_s, p_d, p_d_prev;
+  asn1_node dest_node, p_s, p_d, p_d_prev;
   int move;
 
   if (source_node == NULL)
@@ -429,10 +429,10 @@ _asn1_copy_structure3 (asn1_node_t source_node)
 }
 
 
-static asn1_node_t
-_asn1_copy_structure2 (asn1_node_t root, const char *source_name)
+static asn1_node
+_asn1_copy_structure2 (asn1_node root, const char *source_name)
 {
-  asn1_node_t source_node;
+  asn1_node source_node;
 
   source_node = asn1_find_node (root, source_name);
 
@@ -442,9 +442,9 @@ _asn1_copy_structure2 (asn1_node_t root, const char *source_name)
 
 
 static int
-_asn1_type_choice_config (asn1_node_t node)
+_asn1_type_choice_config (asn1_node node)
 {
-  asn1_node_t p, p2, p3, p4;
+  asn1_node p, p2, p3, p4;
   int move, tlen;
 
   if (node == NULL)
@@ -527,9 +527,9 @@ _asn1_type_choice_config (asn1_node_t node)
 
 
 static int
-_asn1_expand_identifier (asn1_node_t * node, asn1_node_t root)
+_asn1_expand_identifier (asn1_node * node, asn1_node root)
 {
-  asn1_node_t p, p2, p3;
+  asn1_node p, p2, p3;
   char name2[ASN1_MAX_NAME_SIZE + 2];
   int move;
 
@@ -649,10 +649,10 @@ _asn1_expand_identifier (asn1_node_t * node, asn1_node_t root)
  *   @source_name is not known.
  **/
 int
-asn1_create_element (asn1_node_t definitions, const char *source_name,
-		     asn1_node_t * element)
+asn1_create_element (asn1_node definitions, const char *source_name,
+		     asn1_node * element)
 {
-  asn1_node_t dest_node;
+  asn1_node dest_node;
   int res;
 
   dest_node = _asn1_copy_structure2 (definitions, source_name);
@@ -684,10 +684,10 @@ asn1_create_element (asn1_node_t definitions, const char *source_name,
  * from the @name element inside the structure @structure.
  **/
 void
-asn1_print_structure (FILE * out, asn1_node_t structure, const char *name,
+asn1_print_structure (FILE * out, asn1_node structure, const char *name,
 		      int mode)
 {
-  asn1_node_t p, root;
+  asn1_node p, root;
   int k, indent = 0, len, len2, len3;
 
   if (out == NULL)
@@ -1048,9 +1048,9 @@ asn1_print_structure (FILE * out, asn1_node_t structure, const char *name,
  *   @name is not known, %ASN1_GENERIC_ERROR if pointer @num is %NULL.
  **/
 int
-asn1_number_of_elements (asn1_node_t element, const char *name, int *num)
+asn1_number_of_elements (asn1_node element, const char *name, int *num)
 {
-  asn1_node_t node, p;
+  asn1_node node, p;
 
   if (num == NULL)
     return ASN1_GENERIC_ERROR;
@@ -1086,11 +1086,11 @@ asn1_number_of_elements (asn1_node_t element, const char *name, int *num)
  *   the OID.
  **/
 const char *
-asn1_find_structure_from_oid (asn1_node_t definitions, const char *oidValue)
+asn1_find_structure_from_oid (asn1_node definitions, const char *oidValue)
 {
   char definitionsName[ASN1_MAX_NAME_SIZE], name[2 * ASN1_MAX_NAME_SIZE + 1];
   char value[ASN1_MAX_NAME_SIZE];
-  asn1_node_t p;
+  asn1_node p;
   int len;
   int result;
 
@@ -1131,24 +1131,24 @@ asn1_find_structure_from_oid (asn1_node_t definitions, const char *oidValue)
 
 /**
  * asn1_copy_node:
- * @dst: Destination asn1_node_t node.
+ * @dst: Destination asn1_node node.
  * @dst_name: Field name in destination node.
- * @src: Source asn1_node_t node.
+ * @src: Source asn1_node node.
  * @src_name: Field name in source node.
  *
- * Create a deep copy of a asn1_node_t variable.
+ * Create a deep copy of a asn1_node variable.
  *
  * Returns: Return %ASN1_SUCCESS on success.
  **/
 int
-asn1_copy_node (asn1_node_t dst, const char *dst_name,
-		asn1_node_t src, const char *src_name)
+asn1_copy_node (asn1_node dst, const char *dst_name,
+		asn1_node src, const char *src_name)
 {
 /* FIXME: rewrite using copy_structure().
  * It seems quite hard to do.
  */
   int result;
-  asn1_node_t dst_node;
+  asn1_node dst_node;
   void *data = NULL;
   int size = 0;
 
diff --git a/lib/structure.h b/lib/structure.h
index 1e177c0..986e13a 100644
--- a/lib/structure.h
+++ b/lib/structure.h
@@ -28,14 +28,14 @@
 #ifndef _STRUCTURE_H
 #define _STRUCTURE_H
 
-int _asn1_create_static_structure (asn1_node_t pointer,
+int _asn1_create_static_structure (asn1_node pointer,
 					    char *output_file_name,
 					    char *vector_name);
 
-asn1_node_t _asn1_copy_structure3 (asn1_node_t source_node);
+asn1_node _asn1_copy_structure3 (asn1_node source_node);
 
-asn1_node_t _asn1_add_single_node (unsigned int type);
+asn1_node _asn1_add_single_node (unsigned int type);
 
-asn1_node_t _asn1_find_left (asn1_node_t node);
+asn1_node _asn1_find_left (asn1_node node);
 
 #endif
diff --git a/src/asn1Coding.c b/src/asn1Coding.c
index b11dbcb..00057be 100644
--- a/src/asn1Coding.c
+++ b/src/asn1Coding.c
@@ -133,8 +133,8 @@ main (int argc, char *argv[])
   char *inputFileAsnName = NULL;
   char *inputFileAssignmentName = NULL;
   int checkSyntaxOnly = 0;
-  asn1_node_t definitions = NULL;
-  asn1_node_t structure = NULL;
+  asn1_node definitions = NULL;
+  asn1_node structure = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   int asn1_result = ASN1_SUCCESS;
   FILE *outputFile;
diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c
index e2e32a7..ee09e18 100644
--- a/src/asn1Decoding.c
+++ b/src/asn1Decoding.c
@@ -33,7 +33,7 @@
 #include <read-file.h>
 #include "benchmark.h"
 
-static int decode(asn1_node_t definitions, const char* typeName, void* der, int der_len, int benchmark);
+static int decode(asn1_node definitions, const char* typeName, void* der, int der_len, int benchmark);
 
 /* This feature is available in gcc versions 2.5 and later.  */
 #if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
@@ -76,7 +76,7 @@ main (int argc, char *argv[])
   char *inputFileAsnName = NULL;
   char *inputFileDerName = NULL;
   char *typeName = NULL;
-  asn1_node_t definitions = NULL;
+  asn1_node definitions = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   int asn1_result = ASN1_SUCCESS;
   unsigned char *der;
@@ -224,11 +224,11 @@ main (int argc, char *argv[])
   exit (0);
 }
 
-static int simple_decode(asn1_node_t definitions, const char* typeName, void* der, int der_len, int benchmark)
+static int simple_decode(asn1_node definitions, const char* typeName, void* der, int der_len, int benchmark)
 {
   
 int asn1_result;
-asn1_node_t structure = NULL;
+asn1_node structure = NULL;
 char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
 
   asn1_result = asn1_create_element (definitions, typeName, &structure);
@@ -263,7 +263,7 @@ char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   return ASN1_SUCCESS;
 }
 
-static int decode(asn1_node_t definitions, const char* typeName, void* der, int der_len, int benchmark)
+static int decode(asn1_node definitions, const char* typeName, void* der, int der_len, int benchmark)
 {
 struct benchmark_st st;
 
diff --git a/src/asn1Parser.c b/src/asn1Parser.c
index 054af7c..430ac7f 100644
--- a/src/asn1Parser.c
+++ b/src/asn1Parser.c
@@ -80,7 +80,7 @@ main (int argc, char *argv[])
   char *inputFileName = NULL;
   char *vectorName = NULL;
   int checkSyntaxOnly = 0;
-  asn1_node_t pointer = NULL;
+  asn1_node pointer = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   int parse_result = ASN1_SUCCESS;
 
diff --git a/tests/Test_encoding.c b/tests/Test_encoding.c
index 6b3e7bb..d6c7d57 100644
--- a/tests/Test_encoding.c
+++ b/tests/Test_encoding.c
@@ -37,8 +37,8 @@ int
 main (int argc, char *argv[])
 {
   int result, verbose = 0;
-  asn1_node_t definitions = NULL;
-  asn1_node_t asn1_element = NULL;
+  asn1_node definitions = NULL;
+  asn1_node asn1_element = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   const char *treefile = getenv ("ASN1ENCODING");
 
diff --git a/tests/Test_indefinite.c b/tests/Test_indefinite.c
index e951b46..f06db4d 100644
--- a/tests/Test_indefinite.c
+++ b/tests/Test_indefinite.c
@@ -41,8 +41,8 @@ main (int argc, char *argv[])
 {
   int result;
   char buffer[10 * 1024];
-  asn1_node_t definitions = NULL;
-  asn1_node_t asn1_element = NULL;
+  asn1_node definitions = NULL;
+  asn1_node asn1_element = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   FILE *out, *fd;
   ssize_t size;
diff --git a/tests/Test_parser.c b/tests/Test_parser.c
index 6b9ef70..4adb0bf 100644
--- a/tests/Test_parser.c
+++ b/tests/Test_parser.c
@@ -148,7 +148,7 @@ int
 main (int argc, char *argv[])
 {
   int result;
-  asn1_node_t definitions = NULL;
+  asn1_node definitions = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   test_type *test;
   int errorCounter = 0, testCounter = 0;
diff --git a/tests/Test_tree.c b/tests/Test_tree.c
index 70b6df4..abfaa5e 100644
--- a/tests/Test_tree.c
+++ b/tests/Test_tree.c
@@ -433,8 +433,8 @@ int
 main (int argc, char *argv[])
 {
   int result;
-  asn1_node_t definitions = NULL;
-  asn1_node_t asn1_element = NULL;
+  asn1_node definitions = NULL;
+  asn1_node asn1_element = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
   FILE *out;
   test_type *test;


hooks/post-receive
-- 
GNU libtasn1


From MAILER-DAEMON Sun Oct 28 09:50:11 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TSTFj-0007q1-DI
	for mharc-libtasn1-commit@gnu.org; Sun, 28 Oct 2012 09:50:11 -0400
Received: from eggs.gnu.org ([208.118.235.92]:41285)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TSTFh-0007ps-2E
	for libtasn1-commit@gnu.org; Sun, 28 Oct 2012 09:50:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TSTFf-0002Gd-F6
	for libtasn1-commit@gnu.org; Sun, 28 Oct 2012 09:50:08 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51942)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TSTFf-0002G3-BR
	for libtasn1-commit@gnu.org; Sun, 28 Oct 2012 09:50:07 -0400
Received: from nmav by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TSTFd-0000qU-Hp
	for libtasn1-commit@gnu.org; Sun, 28 Oct 2012 13:50:06 +0000
Date: Sun, 28 Oct 2012 13:50:05 +0000
Message-Id: <E1TSTFd-0000qU-Hp@vcs.savannah.gnu.org>
From: "Nikos Mavrogiannopoulos" <nmav@gnutls.org>
To: libtasn1-commit@gnu.org
Subject: [SCM] GNU libtasn1 branch, master, updated. libtasn1_2_13-53-gb789eb8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2f1c471fbcdbcedf69f914a5a3726107c156b17d
X-Git-Newrev: b789eb8ad89e53f4c78be9d0a3d2afa9195250f0
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libtasn1-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libtasn1 <libtasn1-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtasn1-commit>
List-Post: <mailto:libtasn1-commit@gnu.org>
List-Help: <mailto:libtasn1-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Oct 2012 13:50:10 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=b789eb8ad89e53f4c78be9d0a3d2afa9195250f0

The branch, master has been updated
       via  b789eb8ad89e53f4c78be9d0a3d2afa9195250f0 (commit)
       via  3a7e2d58be4bffbb2506f61b8be4f9da405b000b (commit)
       via  58afc050dac52b2d2c56869a2f139729f666b740 (commit)
      from  2f1c471fbcdbcedf69f914a5a3726107c156b17d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b789eb8ad89e53f4c78be9d0a3d2afa9195250f0
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Sun Oct 28 14:46:10 2012 +0100

    break compatibility with previous releases.

commit 3a7e2d58be4bffbb2506f61b8be4f9da405b000b
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Sun Oct 28 14:31:12 2012 +0100

    corrected types

commit 58afc050dac52b2d2c56869a2f139729f666b740
Author: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date:   Sun Oct 28 14:27:11 2012 +0100

    bumped version

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |    2 +-
 configure.ac |    4 ++--
 lib/ASN1.y   |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index d5c9297..7ab3347 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU Libtasn1 NEWS                                     -*- outline -*-
 
-* Noteworthy changes in release 3.0 (unreleased) [stable]
+* Noteworthy changes in release 3.0 (2012-10-28) [stable]
 - Added tool in tests/ to benchmark X.509 structure decoding.
 - Added asn1_read_node_value() to obtain a node's value.
 - Optimizations in internal tree allocation.
diff --git a/configure.ac b/configure.ac
index 5a691e6..aae27f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,9 +28,9 @@ AM_SILENT_RULES([yes])
 # Interfaces changed/added/removed:   CURRENT++       REVISION=0
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
-AC_SUBST(LT_CURRENT, 5)
+AC_SUBST(LT_CURRENT, 6)
 AC_SUBST(LT_REVISION, 0)
-AC_SUBST(LT_AGE, 2)
+AC_SUBST(LT_AGE, 0)
 
 AC_PROG_CC
 gl_EARLY
diff --git a/lib/ASN1.y b/lib/ASN1.y
index 18c93b3..69f43b5 100644
--- a/lib/ASN1.y
+++ b/lib/ASN1.y
@@ -34,7 +34,7 @@
 static FILE *file_asn1;			/* Pointer to file to parse */
 static int result_parse;	/* result of the parser
 					   algorithm */
-static asn1_node_t p_tree;		/* pointer to the root of the
+static asn1_node p_tree;		/* pointer to the root of the
 					   structure created by the
 					   parser*/
 static unsigned long lineNumber;	/* line number describing the
@@ -57,7 +57,7 @@ static int _asn1_yylex(void);
 %union {
   unsigned int constant;
   char str[ASN1_MAX_NAME_SIZE+1];
-  asn1_node_t node;
+  asn1_node node;
 }
 
 
@@ -578,7 +578,7 @@ _asn1_create_errorDescription(int error,char *errorDescription)
  *   characters.
  **/
 int
-asn1_parser2tree(const char *file_name, asn1_node_t *definitions,
+asn1_parser2tree(const char *file_name, asn1_node *definitions,
 		 char *errorDescription) 
 {
 


hooks/post-receive
-- 
GNU libtasn1


From MAILER-DAEMON Sun Oct 28 10:48:25 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1TSUA5-0006sW-Rx
	for mharc-libtasn1-commit@gnu.org; Sun, 28 Oct 2012 10:48:25 -0400
Received: from eggs.gnu.org ([208.118.235.92]:37468)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TSUA2-0006sD-Le
	for libtasn1-commit@gnu.org; Sun, 28 Oct 2012 10:48:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TSUA1-0000mY-Fe
	for libtasn1-commit@gnu.org; Sun, 28 Oct 2012 10:48:22 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:58021)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TSUA1-0000mU-Bl
	for libtasn1-commit@gnu.org; Sun, 28 Oct 2012 10:48:21 -0400
Received: from nmav by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1TSUA0-0002y7-Pj
	for libtasn1-commit@gnu.org; Sun, 28 Oct 2012 14:48:20 +0000
Date: Sun, 28 Oct 2012 14:48:20 +0000
Message-Id: <E1TSUA0-0002y7-Pj@vcs.savannah.gnu.org>
From: "Nikos Mavrogiannopoulos" <nmav@gnutls.org>
To: libtasn1-commit@gnu.org
Subject: [SCM] GNU libtasn1 annotated tag, libtasn1_3_0, created. libtasn1_3_0
X-Git-Refname: refs/tags/libtasn1_3_0
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 38eaa003b154df28bb0258d1fd2e5a02b840fd0a
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libtasn1-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libtasn1 <libtasn1-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libtasn1-commit>
List-Post: <mailto:libtasn1-commit@gnu.org>
List-Help: <mailto:libtasn1-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libtasn1-commit>,
	<mailto:libtasn1-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Oct 2012 14:48:23 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=38eaa003b154df28bb0258d1fd2e5a02b840fd0a

The annotated tag, libtasn1_3_0 has been created
        at  38eaa003b154df28bb0258d1fd2e5a02b840fd0a (tag)
   tagging  b789eb8ad89e53f4c78be9d0a3d2afa9195250f0 (commit)
  replaces  libtasn1_2_13
 tagged by  Nikos Mavrogiannopoulos
        on  Sun Oct 28 15:48:01 2012 +0100

- Log -----------------------------------------------------------------
released 3.0.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQEcBAABAgAGBQJQjUWlAAoJEJ1eqvaQE7hCfWoH/0K6PC+yJqPiiZjcXOz1sUG9
g2vs/+JTflpUUtp69btg6QZHvzVg4H99qYmped2MbmMNxxhbTadczTT9Cha1ehyR
9vnQIcdoutnnOMyJMCeOuKbCiHi+9rWEB9iuC/FFHAg5Nv12eKFvOWsqQFkiXylK
exnEcP5bPuiY/7hv/O+4D8SY0i7b/CR3xpQcA7w0q0Saw9ywOeP8gqL+1GMc4Wtj
fvuCybmb4v8wiUtSISLHsLXRhqVqhby7oKqxjsHZeFPB1GtnWYHPb2TVw2xGBXNh
Zh1iCXiHYRhQDlsZtsjRYAvHN0DMZbFftyZxYAQ9qkqEwVgRfc+1p9h84Zq+3Sk=
=lEo4
-----END PGP SIGNATURE-----

Nikos Mavrogiannopoulos (45):
      Updated to new gnulib and added gettime.
      Added tool to benchmark X.509 structure decoding.
      eliminates few leaks
      bumped version
      internal structure removed
      name is now a statically allocated string and other optimizations.
      small_value_size changed to 8. No visible difference in performance
      Added asn1_read_node_value()
      Node type field is now included in ASN1_DATA_NODE.
      no need to reserve.
      reduced maximum name size
      Eliminated _asn1_malloc, _asn1_free and _asn_calloc.
      _asn1_add_node -> _asn1_add_static_node
      _asn1_add_node_only -> _asn1_add_single_node
      Added symbol into old API
      Revert "small_value_size changed to 8. No visible difference in performance"
      removed unneeded casts
      name has size of ASN1_MAX_NAME_SIZE+1 to allow for a terminating null.
      Corrected the test.
      documented updates
      Some small optimizations and better checking of tree accesses.
      other small fix
      increased benchmark time
      improve performance by 50% by using hashes to compare strings.
      small optimizations to avoid recalculation of hashes when copying nodes.
      asn1_retCode -> int
      Renamed types.
      ASN1_ARRAY_TYPE -> asn_static_node_t
      node_data_struct -> asn_data_node_st
      updated to new types
      ASN1_TYPE definition corrected
      documented update
      eliminated use of old types
      Use hash-pjw-bare instead of asn1_bhash().
      Updated gllib and added hash-pjw-bare.
      removed unneeded variables and files.
      updated
      Set the error description to null initialy.
      asn_ -> asn1_
      Allow empty IDENTIFIERS in ASN1 definitions. Suggested by Ivan Shmakov.
      Silence tests.
      Renamed structures.
      bumped version
      corrected types
      break compatibility with previous releases.

Simon Josefsson (7):
      Fix release targets.
      Update for 2.12.
      Bump versions.
      Fix compilation warnings.
      Bump years.
      Drop long-time deprecated functions.
      Add.

Tim Ruehsen (1):
      cleanup _asn1_copy_structure3

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU libtasn1


