[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_9-8-gd1b1294

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

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

The branch, gnutls_2_12_x has been updated
       via  d1b1294cc53a8efb069fc9454370f74cca72fef2 (commit)
       via  022ad1ceabc50ea3244a03d669b1536c78e40fd7 (commit)
       via  8aa478ff1545c9255253be96fa7a8b547839fe24 (commit)
      from  8fed4038d83d63941fe3e488a0a4103d38c48529 (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 d1b1294cc53a8efb069fc9454370f74cca72fef2
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Aug 31 16:48:19 2011 +0200

    OpenPGP certificate type is not enabled by default.

commit 022ad1ceabc50ea3244a03d669b1536c78e40fd7
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Aug 30 21:01:07 2011 +0200

    removed unneeded headers.

commit 8aa478ff1545c9255253be96fa7a8b547839fe24
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Aug 30 21:00:57 2011 +0200

    documented updates

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

Summary of changes:
 NEWS                  |    6 ++++++
 lib/gnutls_priority.c |   11 ++++++++---
 src/common.h          |    1 -
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index dc5482f..6cc45f0 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,12 @@ See the end for copying conditions.
 
 * Version 2.12.10 (unreleased)
 
+** libgnutls: OpenPGP certificate type is not enabled
+by default.
+
+** libgnutls: Corrected issue in gnutls_record_recv()
+triggered on encryption or compression error.
+
 ** libgnutls: Corrected parsing of XMPP subject alternative 
 names.
 
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 8f59207..bd8cb5a 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -369,7 +369,12 @@ static const int mac_priority_secure[] = {
   0
 };
 
-static int cert_type_priority[] = {
+static const int cert_type_priority_default[] = {
+  GNUTLS_CRT_X509,
+  0
+};
+
+static const int cert_type_priority_all[] = {
   GNUTLS_CRT_X509,
   GNUTLS_CRT_OPENPGP,
   0
@@ -558,7 +563,7 @@ gnutls_priority_init (gnutls_priority_t * priority_cache,
     {
       _set_priority (&(*priority_cache)->protocol, protocol_priority);
       _set_priority (&(*priority_cache)->compression, comp_priority);
-      _set_priority (&(*priority_cache)->cert_type, cert_type_priority);
+      _set_priority (&(*priority_cache)->cert_type, 
cert_type_priority_default);
       _set_priority (&(*priority_cache)->sign_algo, sign_priority_default);
       i = 0;
     }
@@ -676,7 +681,7 @@ gnutls_priority_init (gnutls_priority_t * priority_cache,
               if (strncasecmp (&broken_list[i][1], "CTYPE-ALL", 9) == 0)
                 {
                   bulk_fn (&(*priority_cache)->cert_type,
-                                 cert_type_priority);
+                                 cert_type_priority_all);
                 }
               else
                 {
diff --git a/src/common.h b/src/common.h
index 4a7e1aa..17eb8dd 100644
--- a/src/common.h
+++ b/src/common.h
@@ -4,7 +4,6 @@
 #include <gnutls/gnutls.h>
 
 #include <sys/socket.h>
-#include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
 #include <netinet/in.h>


hooks/post-receive
-- 
GNU gnutls