[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-97-g7caf698

[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=7caf6980524d546fd79076bb0c28f5975ac1679f

The branch, master has been updated
       via  7caf6980524d546fd79076bb0c28f5975ac1679f (commit)
       via  df414f6bf5e31aa076baf06810b0ce7e7e0a4849 (commit)
       via  344a8f006f653afc2e03f7af7e2b3d9a598b453f (commit)
       via  2c8df878c3f583b74c66e4cf945c89d2386e76f6 (commit)
      from  329138359a256f346e3c10f323d5d87cfc08cdeb (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 7caf6980524d546fd79076bb0c28f5975ac1679f
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:44:21 2010 +0100

    Use libtasn1 v2.4.

commit df414f6bf5e31aa076baf06810b0ce7e7e0a4849
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:43:04 2010 +0100

    Fix license.

commit 344a8f006f653afc2e03f7af7e2b3d9a598b453f
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:40:54 2010 +0100

    Fix license.

commit 2c8df878c3f583b74c66e4cf945c89d2386e76f6
Author: Simon Josefsson <address@hidden>
Date:   Wed Jan 27 16:40:35 2010 +0100

    Fix license.

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

Summary of changes:
 .clcopying                 |    3 ++-
 AUTHORS                    |    4 ++--
 NEWS                       |    2 ++
 lib/gnutls.pc.in           |   19 +++++++++----------
 lib/minitasn1/coding.c     |    4 ++--
 lib/minitasn1/decoding.c   |   40 ++++++++++++++++++----------------------
 lib/minitasn1/element.c    |    4 ++--
 lib/minitasn1/errors.c     |    4 ++--
 lib/minitasn1/gstr.c       |    5 ++---
 lib/minitasn1/int.h        |    5 ++---
 lib/minitasn1/libtasn1.h   |    7 +++----
 lib/minitasn1/parser_aux.c |    5 ++---
 lib/minitasn1/structure.c  |    7 +++----
 13 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/.clcopying b/.clcopying
index 555dd80..548dd69 100644
--- a/.clcopying
+++ b/.clcopying
@@ -1,6 +1,7 @@
        -----
 
-       Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+       Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010  Free Software
+       Foundation, Inc.
 
        Copying and distribution of this file, with or without
        modification, are permitted provided the copyright notice
diff --git a/AUTHORS b/AUTHORS
index 57280cc..c3cceed 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,6 @@
 GNU TLS AUTHORS -- Information about the authors.
-Copyright (C) 2006, 2007, 2008, 2009 Simon Josefsson
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Nikos Mavrogiannopoulos
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+              2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 See the end for copying conditions.
 
 The copyright holder for GnuTLS is Free Software Foundation, Inc., 51
diff --git a/NEWS b/NEWS
index 3b24437..7dcb1af 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,8 @@ Reported by and tiny patch from Vitaly Mayatskikh
 <address@hidden> in
 <http://thread.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/4096>.
 
+** minitasn1: Upgraded to libtasn1 version 2.4.
+
 ** API and ABI modifications:
 gnutls_cipher_decrypt: Added
 gnutls_cipher_deinit: Added
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index 3b01c17..a4a3495 100644
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -1,15 +1,14 @@
 # Process this file with autoconf to produce a pkg-config metadata file.
-# Copyright (C) 2002, 2003, 2004, 2005,
-#               2006, 2007, 2008, 2009 Free Software Foundation
+
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software
+# Foundation, Inc.
+
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+
 # Author: Simon Josefsson
-# 
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-# 
-# This file is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 address@hidden@
 address@hidden@
diff --git a/lib/minitasn1/coding.c b/lib/minitasn1/coding.c
index a5f07f6..11df3fc 100644
--- a/lib/minitasn1/coding.c
+++ b/lib/minitasn1/coding.c
@@ -1,6 +1,6 @@
 /*
- *      Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
- *      Copyright (C) 2002  Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *
diff --git a/lib/minitasn1/decoding.c b/lib/minitasn1/decoding.c
index 4e623c4..da64510 100644
--- a/lib/minitasn1/decoding.c
+++ b/lib/minitasn1/decoding.c
@@ -1,6 +1,6 @@
 /*
- *      Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
- *      Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2006, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *
@@ -288,20 +288,18 @@ _asn1_get_objectid_der (const unsigned char *der, int 
der_len, int *ret_len,
   leading = 1;
   for (k = 1; k < len; k++)
     {
-
+      
 
       /* X.690 mandates that the leading byte must never be 0x80
        */
-      if (leading != 0 && der[len_len + k] == 0x80)
-       return ASN1_DER_ERROR;
+      if (leading != 0 && der[len_len + k] == 0x80) return ASN1_DER_ERROR;
       leading = 0;
 
       /* check for wrap around */
       val = val << 7;
       val |= der[len_len + k] & 0x7F;
 
-      if (val < prev_val)
-       return ASN1_DER_ERROR;
+      if (val < prev_val) return ASN1_DER_ERROR;
 
       prev_val = val;
 
@@ -315,7 +313,7 @@ _asn1_get_objectid_der (const unsigned char *der, int 
der_len, int *ret_len,
        }
     }
   *ret_len = len + len_len;
-
+  
   return ASN1_SUCCESS;
 }
 
@@ -808,8 +806,8 @@ _asn1_get_indefinite_length_string (const unsigned char 
*der, int *len)
   *   error occurred.
   *
   * Fill the structure *ELEMENT with values of a DER encoding
-  * string. The sructure must just be created with function
-  * 'create_stucture'.  If an error occurs during the decoding
+  * 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.
   *
@@ -1056,9 +1054,8 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider, 
int len,
              move = RIGHT;
              break;
            case TYPE_OBJECT_ID:
-             result =
-               _asn1_get_objectid_der (der + counter, len - counter, &len2,
-                                       temp, sizeof (temp));
+             result = _asn1_get_objectid_der (der + counter, len - counter, 
&len2,
+                                     temp, sizeof (temp));
              if (result != ASN1_SUCCESS)
                {
                  asn1_delete_structure (element);
@@ -1367,8 +1364,8 @@ asn1_der_decoding (ASN1_TYPE * element, const void *ider, 
int len,
   *   error occurred.
   *
   * Fill the element named ELEMENTNAME with values of a DER encoding
-  * string.  The sructure must just be created with function
-  * 'create_stucture'.  The DER vector must contain the encoding
+  * string.  The structure must just be created with function
+  * '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.
@@ -1673,13 +1670,12 @@ asn1_der_decoding_element (ASN1_TYPE * structure, const 
char *elementName,
            case TYPE_OBJECT_ID:
              if (state == FOUND)
                {
-                 result =
-                   _asn1_get_objectid_der (der + counter, len - counter,
-                                           &len2, temp, sizeof (temp));
-                 if (result != ASN1_SUCCESS)
-                   {
-                     return result;
-                   }
+                 result = _asn1_get_objectid_der (der + counter, len - 
counter, &len2,
+                                         temp, sizeof (temp));
+                  if (result != ASN1_SUCCESS)
+                  {
+                   return result;
+                  }
 
                  tlen = strlen (temp);
 
diff --git a/lib/minitasn1/element.c b/lib/minitasn1/element.c
index df14700..09a6a9f 100644
--- a/lib/minitasn1/element.c
+++ b/lib/minitasn1/element.c
@@ -1,6 +1,6 @@
 /*
- *      Copyright (C) 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
- *      Copyright (C) 2000, 2001, 2002, 2003 Fabio Fiorina
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010
+ * Free Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *
diff --git a/lib/minitasn1/errors.c b/lib/minitasn1/errors.c
index 86dec68..56d5f08 100644
--- a/lib/minitasn1/errors.c
+++ b/lib/minitasn1/errors.c
@@ -1,6 +1,6 @@
 /*
- *      Copyright (C) 2006, 2008, 2009 Free Software Foundation, Inc.
- *      Copyright (C) 2002, 2005 Fabio Fiorina
+ * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *
diff --git a/lib/minitasn1/gstr.c b/lib/minitasn1/gstr.c
index e08de14..b3f6af2 100644
--- a/lib/minitasn1/gstr.c
+++ b/lib/minitasn1/gstr.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
- * Inc.
- * Copyright (C) 2002 Nikos Mavroyanopoulos
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *
diff --git a/lib/minitasn1/int.h b/lib/minitasn1/int.h
index bc583c4..def4927 100644
--- a/lib/minitasn1/int.h
+++ b/lib/minitasn1/int.h
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
- * Foundation, Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *
diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h
index d108322..ba80671 100644
--- a/lib/minitasn1/libtasn1.h
+++ b/lib/minitasn1/libtasn1.h
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
- * Foundation, Inc.
- * Copyright (C) 2002 Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *
@@ -46,7 +45,7 @@ extern "C"
 {
 #endif
 
-#define ASN1_VERSION "2.3"
+#define ASN1_VERSION "2.4"
 
   typedef int asn1_retCode;    /* type returned by libtasn1 functions */
 
diff --git a/lib/minitasn1/parser_aux.c b/lib/minitasn1/parser_aux.c
index 6057813..5ee2dee 100644
--- a/lib/minitasn1/parser_aux.c
+++ b/lib/minitasn1/parser_aux.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Free Software
- * Foundation, Inc.
- * Copyright (C) 2000,2001 Fabio Fiorina
+ * Copyright (C) 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *
diff --git a/lib/minitasn1/structure.c b/lib/minitasn1/structure.c
index fc7d727..edaafe6 100644
--- a/lib/minitasn1/structure.c
+++ b/lib/minitasn1/structure.c
@@ -1,7 +1,6 @@
 /*
- * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010 Free Software
- * Foundation, Inc.
- * Copyright (C) 2002  Fabio Fiorina
+ * Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
  *
  * This file is part of LIBTASN1.
  *
@@ -671,7 +670,7 @@ _asn1_expand_identifier (ASN1_TYPE * node, ASN1_TYPE root)
   * Creates a structure of type @source_name.  Example using
   *  "pkix.asn":
   *
-  * rc = asn1_create_structure(cert_def, "PKIX1.Certificate",
+  * rc = asn1_create_element(cert_def, "PKIX1.Certificate",
   * certptr);
   *
   * Returns:


hooks/post-receive
-- 
GNU gnutls