[SCM] GNU libtasn1 branch, master, updated. libtasn1_3_0-35-g3c439d2

[Nikos Mavrogiannopoulos]

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=3c439d2a5c5fb669645076bcd380a352fb23d725

The branch, master has been updated
       via  3c439d2a5c5fb669645076bcd380a352fb23d725 (commit)
      from  87eaca2a83999caa575df98a7d7e483251c361ee (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 3c439d2a5c5fb669645076bcd380a352fb23d725
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 24 17:57:51 2012 +0100

    corrected compatibility mode with old structures.

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

Summary of changes:
 lib/int.h        |    2 +-
 lib/parser_aux.c |    2 +-
 lib/structure.c  |    9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/int.h b/lib/int.h
index ce20ab2..3163d50 100644
--- a/lib/int.h
+++ b/lib/int.h
@@ -167,7 +167,7 @@ inline static unsigned int convert_old_type(unsigned int 
ntype)
 unsigned int type = ntype & 0xff;
   if (type == ASN1_ETYPE_TIME)
     {
-      if (type & CONST_UTC)
+      if (ntype & CONST_UTC)
         type = ASN1_ETYPE_UTC_TIME;
       else
         type = ASN1_ETYPE_GENERALIZED_TIME;
diff --git a/lib/parser_aux.c b/lib/parser_aux.c
index 4fcc7d7..50238d2 100644
--- a/lib/parser_aux.c
+++ b/lib/parser_aux.c
@@ -73,7 +73,7 @@ _asn1_add_static_node (unsigned int type)
   listElement->next = firstElement;
   firstElement = listElement;
 
-  punt->type = convert_old_type(type);
+  punt->type = type;
 
   return punt;
 }
diff --git a/lib/structure.c b/lib/structure.c
index 1659067..31a5f65 100644
--- a/lib/structure.c
+++ b/lib/structure.c
@@ -181,6 +181,7 @@ asn1_array2tree (const asn1_static_node * array, asn1_node 
* definitions,
   unsigned long k;
   int move;
   int result;
+  unsigned int type;
 
 
   if (*definitions != NULL)
@@ -191,7 +192,9 @@ asn1_array2tree (const asn1_static_node * array, asn1_node 
* definitions,
   k = 0;
   while (array[k].value || array[k].type || array[k].name)
     {
-      p = _asn1_add_static_node (array[k].type & (~CONST_DOWN));
+      type = convert_old_type(array[k].type);
+
+      p = _asn1_add_static_node (type & (~CONST_DOWN));
       if (array[k].name)
        _asn1_set_name (p, array[k].name);
       if (array[k].value)
@@ -207,9 +210,9 @@ asn1_array2tree (const asn1_static_node * array, asn1_node 
* definitions,
 
       p_last = p;
 
-      if (array[k].type & CONST_DOWN)
+      if (type & CONST_DOWN)
        move = DOWN;
-      else if (array[k].type & CONST_RIGHT)
+      else if (type & CONST_RIGHT)
        move = RIGHT;
       else
        {


hooks/post-receive
-- 
GNU libtasn1