[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-149-g2219b5a

[Simon Josefsson]

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 gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=2219b5a06a1ca5178375f37e9556a409c0b6220c

The branch, master has been updated
       via  2219b5a06a1ca5178375f37e9556a409c0b6220c (commit)
      from  19bb0b223e8c05112f62aeff830b3eba75189263 (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 2219b5a06a1ca5178375f37e9556a409c0b6220c
Author: Simon Josefsson <address@hidden>
Date:   Mon Jun 11 12:45:49 2012 +0200

    Update to libtasn1 2.13.

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

Summary of changes:
 NEWS                       |    2 ++
 lib/minitasn1/coding.c     |    4 ++--
 lib/minitasn1/decoding.c   |   21 +++++++++++----------
 lib/minitasn1/errors.c     |    2 +-
 lib/minitasn1/gstr.c       |    2 +-
 lib/minitasn1/int.h        |    4 ++--
 lib/minitasn1/libtasn1.h   |    6 +++---
 lib/minitasn1/parser_aux.c |    3 ++-
 lib/minitasn1/version.c    |    2 +-
 9 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/NEWS b/NEWS
index 132b872..f3ff364 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,8 @@ password was provided.
 ** libgnutlsxx: Added session::set_transport_vec_push_function. Patch
 by Alexandre Bique.
 
+** minitasn1: Upgraded to libtasn1 version 2.13.
+
 ** API and ABI modifications:
 GNUTLS_CERT_SIGNATURE_FAILURE: Added
 gnutls_pubkey_verify_hash2: Added
diff --git a/lib/minitasn1/coding.c b/lib/minitasn1/coding.c
index 8b72eba..307dd40 100644
--- a/lib/minitasn1/coding.c
+++ b/lib/minitasn1/coding.c
@@ -256,7 +256,7 @@ _asn1_objectid_der (unsigned char *str, unsigned char *der, 
int *der_len)
   char *temp, *n_end, *n_start;
   unsigned char bit7;
   unsigned long val, val1 = 0;
-  int str_len = _asn1_strlen(str);
+  int str_len = _asn1_strlen (str);
 
   max_len = *der_len;
 
@@ -266,7 +266,7 @@ _asn1_objectid_der (unsigned char *str, unsigned char *der, 
int *der_len)
 
   memcpy (temp, str, str_len);
   temp[str_len] = '.';
-  temp[str_len+1] = 0;
+  temp[str_len + 1] = 0;
 
   counter = 0;
   n_start = temp;
diff --git a/lib/minitasn1/decoding.c b/lib/minitasn1/decoding.c
index 1cfad35..e6cdb98 100644
--- a/lib/minitasn1/decoding.c
+++ b/lib/minitasn1/decoding.c
@@ -58,11 +58,11 @@ _asn1_error_description_tag_error (ASN1_TYPE node, char 
*ErrorDescription)
  *   length, or -2 when the value was too big to fit in a int, or -4
  *   when the decoded length value plus @len would exceed @der_len.
  **/
-signed long
+long
 asn1_get_length_der (const unsigned char *der, int der_len, int *len)
 {
   unsigned int ans, sum, last;
-  unsigned int k, punt;
+  int k, punt;
 
   *len = 0;
   if (der_len <= 0)
@@ -87,7 +87,7 @@ asn1_get_length_der (const unsigned char *der, int der_len, 
int *len)
              last = ans;
 
              ans = (ans*256) + der[punt++];
-             if (ans < last) 
+             if (ans < last)
                /* we wrapped around, no bignum support... */
                return -2;
            }
@@ -102,13 +102,13 @@ asn1_get_length_der (const unsigned char *der, int 
der_len, int *len)
     }
 
   sum = ans + *len;
-  
+
   /* check for overflow as well INT_MAX as a maximum upper
    * limit for length */
   if (sum >= INT_MAX || sum < ans)
     return -2;
-  
-  if (sum > der_len)
+
+  if (((int) sum) > der_len)
     return -4;
 
   return ans;
@@ -130,7 +130,8 @@ int
 asn1_get_tag_der (const unsigned char *der, int der_len,
                  unsigned char *cls, int *len, unsigned long *tag)
 {
-  unsigned int punt, ris;
+  unsigned int ris;
+  int punt;
   unsigned int last;
 
   if (der == NULL || der_len < 2 || len == NULL)
@@ -162,10 +163,10 @@ asn1_get_tag_der (const unsigned char *der, int der_len,
        return ASN1_DER_ERROR;
 
       last = ris;
-        
+
       ris = (ris * 128) + (der[punt++] & 0x7F);
       if (ris < last)
-        return ASN1_DER_ERROR;
+       return ASN1_DER_ERROR;
 
       *len = punt;
     }
@@ -189,7 +190,7 @@ asn1_get_tag_der (const unsigned char *der, int der_len,
  *
  * Since: 2.0
  **/
-signed long
+long
 asn1_get_length_ber (const unsigned char *ber, int ber_len, int *len)
 {
   int ret;
diff --git a/lib/minitasn1/errors.c b/lib/minitasn1/errors.c
index 7878c50..76611d8 100644
--- a/lib/minitasn1/errors.c
+++ b/lib/minitasn1/errors.c
@@ -21,7 +21,7 @@
 
 #include <int.h>
 #ifdef STDC_HEADERS
-# include <stdarg.h>
+#include <stdarg.h>
 #endif
 
 #define LIBTASN1_ERROR_ENTRY(name) { #name, name }
diff --git a/lib/minitasn1/gstr.c b/lib/minitasn1/gstr.c
index 9590b45..4785073 100644
--- a/lib/minitasn1/gstr.c
+++ b/lib/minitasn1/gstr.c
@@ -61,7 +61,7 @@ _asn1_str_cpy (char *dest, size_t dest_tot_size, const char 
*src)
     {
       if (dest_tot_size > 0)
        {
-         strncpy (dest, src, (dest_tot_size) - 1);
+         memcpy (dest, src, dest_tot_size - 1);
          dest[dest_tot_size - 1] = 0;
        }
     }
diff --git a/lib/minitasn1/int.h b/lib/minitasn1/int.h
index fcaf0d8..82de579 100644
--- a/lib/minitasn1/int.h
+++ b/lib/minitasn1/int.h
@@ -23,7 +23,7 @@
 #define INT_H
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <string.h>
@@ -33,7 +33,7 @@
 #include <stdint.h>
 
 #ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
+#include <sys/types.h>
 #endif
 
 #include <libtasn1.h>
diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h
index 289fb57..063b1d6 100644
--- a/lib/minitasn1/libtasn1.h
+++ b/lib/minitasn1/libtasn1.h
@@ -44,7 +44,7 @@ extern "C"
 {
 #endif
 
-#define ASN1_VERSION "2.12"
+#define ASN1_VERSION "2.13"
 
   typedef int asn1_retCode;    /* type returned by libtasn1 functions */
 
@@ -261,10 +261,10 @@ extern "C"
                      int *ret_len, unsigned char *str,
                      int str_size, int *bit_len);
 
-  extern ASN1_API signed long
+  extern ASN1_API long
     asn1_get_length_der (const unsigned char *der, int der_len, int *len);
 
-  extern ASN1_API signed long
+  extern ASN1_API long
     asn1_get_length_ber (const unsigned char *ber, int ber_len, int *len);
 
   extern ASN1_API void
diff --git a/lib/minitasn1/parser_aux.c b/lib/minitasn1/parser_aux.c
index ce55253..2e1f7ee 100644
--- a/lib/minitasn1/parser_aux.c
+++ b/lib/minitasn1/parser_aux.c
@@ -718,7 +718,8 @@ _asn1_expand_object_id (ASN1_TYPE node)
                    {
                      _asn1_str_cpy (name2, sizeof (name2), name_root);
                      _asn1_str_cat (name2, sizeof (name2), ".");
-                     _asn1_str_cat (name2, sizeof (name2), (char *) p2->value);
+                     _asn1_str_cat (name2, sizeof (name2),
+                                    (char *) p2->value);
                      p3 = asn1_find_node (node, name2);
                      if (!p3 || (type_field (p3->type) != TYPE_OBJECT_ID) ||
                          !(p3->type & CONST_ASSIGN))
diff --git a/lib/minitasn1/version.c b/lib/minitasn1/version.c
index fb17223..83d70c9 100644
--- a/lib/minitasn1/version.c
+++ b/lib/minitasn1/version.c
@@ -20,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include <config.h>
 #endif
 
 #include <string.h>            /* for strverscmp */


hooks/post-receive
-- 
GNU gnutls