[SCM] GNU libtasn1 branch, master, updated. libtasn1_3_0-27-g57e61a0

[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=57e61a0d130b4bae6331c2412f87c45fcd540af2

The branch, master has been updated
       via  57e61a0d130b4bae6331c2412f87c45fcd540af2 (commit)
      from  1d02266a174c939e9ca1460641c8eaa9dc2a7843 (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 57e61a0d130b4bae6331c2412f87c45fcd540af2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 23 21:36:51 2012 +0100

    Added asn1_read_value_type().

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

Summary of changes:
 NEWS             |    1 +
 lib/element.c    |   80 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 lib/libtasn1.h   |    4 +++
 lib/libtasn1.map |    1 +
 4 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index a29e187..371e804 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ GNU Libtasn1 NEWS                                     -*- 
outline -*-
   a warning is being print instead of failing.
 - Parser outputs more detailed syntax error message.
 - Added asn1_decode_simple_der() and asn1_encode_simple_der().
+- Added asn1_read_value_type() to return value and type.
 
 * Noteworthy changes in release 3.0 (2012-10-28) [stable]
 - Added tool in tests/ to benchmark X.509 structure decoding.
diff --git a/lib/element.c b/lib/element.c
index d5df2e5..2e3d48e 100644
--- a/lib/element.c
+++ b/lib/element.c
@@ -700,22 +700,96 @@ asn1_write_value (asn1_node node_root, const char *name,
 int
 asn1_read_value (asn1_node root, const char *name, void *ivalue, int *len)
 {
+  return asn1_read_value_type( root, name, ivalue, len, NULL);
+}
+
+/**
+ * asn1_read_value_type:
+ * @root: pointer to a structure.
+ * @name: the name of the element inside a structure that you want to read.
+ * @ivalue: vector that will contain the element's content, must be a
+ *   pointer to memory cells already allocated.
+ * @len: number of bytes of *value: value[0]..value[len-1]. Initialy
+ *   holds the sizeof value.
+ * @etype: The type of the value read (ASN1_ETYPE)
+ *
+ * Returns the value of one element inside a structure.
+ *
+ * If an element is OPTIONAL and the function "read_value" returns
+ * %ASN1_ELEMENT_NOT_FOUND, it means that this element wasn't present
+ * in the der encoding that created the structure.  The first element
+ * of a SEQUENCE_OF or SET_OF is named "?1". The second one "?2" and
+ * so on.
+ *
+ * INTEGER: VALUE will contain a two's complement form integer.
+ *
+ *            integer=-1  -> value[0]=0xFF , len=1.
+ *            integer=1   -> value[0]=0x01 , len=1.
+ *
+ * ENUMERATED: As INTEGER (but only with not negative numbers).
+ *
+ * BOOLEAN: VALUE will be the null terminated string "TRUE" or
+ *   "FALSE" and LEN=5 or LEN=6.
+ *
+ * OBJECT IDENTIFIER: VALUE will be a null terminated string with
+ *   each number separated by a dot (i.e. "1.2.3.543.1").
+ *
+ *                      LEN = strlen(VALUE)+1
+ *
+ * UTCTime: VALUE will be a null terminated string in one of these
+ *   formats: "YYMMDDhhmmss+hh'mm'" or "YYMMDDhhmmss-hh'mm'".
+ *   LEN=strlen(VALUE)+1.
+ *
+ * GeneralizedTime: VALUE will be a null terminated string in the
+ *   same format used to set the value.
+ *
+ * OCTET STRING: VALUE will contain the octet string and LEN will be
+ *   the number of octets.
+ *
+ * GeneralString: VALUE will contain the generalstring and LEN will
+ *   be the number of octets.
+ *
+ * BIT STRING: VALUE will contain the bit string organized by bytes
+ *   and LEN will be the number of bits.
+ *
+ * CHOICE: If NAME indicates a choice type, VALUE will specify the
+ *   alternative selected.
+ *
+ * ANY: If NAME indicates an any type, VALUE will indicate the DER
+ *   encoding of the structure actually used.
+ *
+ * Returns: %ASN1_SUCCESS if value is returned,
+ *   %ASN1_ELEMENT_NOT_FOUND if @name is not a valid element,
+ *   %ASN1_VALUE_NOT_FOUND if there isn't any value for the element
+ *   selected, and %ASN1_MEM_ERROR if The value vector isn't big enough
+ *   to store the result, and in this case @len will contain the number of
+ *   bytes needed.
+ **/
+int
+asn1_read_value_type (asn1_node root, const char *name, void *ivalue, int *len,
+                      unsigned int *etype)
+{
   asn1_node node, p, p2;
   int len2, len3;
   int value_size = *len;
   unsigned char *value = ivalue;
+  unsigned type;
 
   node = asn1_find_node (root, name);
   if (node == NULL)
     return ASN1_ELEMENT_NOT_FOUND;
 
-  if ((type_field (node->type) != ASN1_ETYPE_NULL) &&
-      (type_field (node->type) != ASN1_ETYPE_CHOICE) &&
+  type = type_field (node->type);
+
+  if ((type != ASN1_ETYPE_NULL) &&
+      (type != ASN1_ETYPE_CHOICE) &&
       !(node->type & CONST_DEFAULT) && !(node->type & CONST_ASSIGN) &&
       (node->value == NULL))
     return ASN1_VALUE_NOT_FOUND;
 
-  switch (type_field (node->type))
+  if (etype)
+    *etype = type;
+  switch (type)
     {
     case ASN1_ETYPE_NULL:
       PUT_STR_VALUE (value, value_size, "NULL");
diff --git a/lib/libtasn1.h b/lib/libtasn1.h
index 6a164b0..59c3093 100644
--- a/lib/libtasn1.h
+++ b/lib/libtasn1.h
@@ -224,6 +224,10 @@ extern "C"
                     void *ivalue, int *len);
 
   extern ASN1_API int
+    asn1_read_value_type (asn1_node root, const char *name,
+                         void *ivalue, int *len, unsigned int* etype);
+
+  extern ASN1_API int
     asn1_read_node_value (asn1_node node, asn1_data_node_st* data);
 
   extern ASN1_API int
diff --git a/lib/libtasn1.map b/lib/libtasn1.map
index a2b9416..439e4b0 100644
--- a/lib/libtasn1.map
+++ b/lib/libtasn1.map
@@ -52,6 +52,7 @@ LIBTASN1_0_3
     asn1_read_node_value;
     asn1_encode_simple_der;
     asn1_decode_simple_der;
+    asn1_read_value_type;
 
     # Old symbols
     libtasn1_strerror;


hooks/post-receive
-- 
GNU libtasn1