From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 31 Aug 2011 14:30:13 +0000 (+0200)
Subject: OpenPGP certificate type priority is not enabled by default.
X-Git-Tag: gnutls_3_0_2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=240cae972d30ca4de7ead5f85b8bea113bef437a;p=thirdparty%2Fgnutls.git

OpenPGP certificate type priority is not enabled by default.
---

diff --git a/NEWS b/NEWS
index 0d5bafca30..e1e245dd31 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ See the end for copying conditions.
 
 * Version 3.0.2 (unreleased)
 
+** libgnutls: OpenPGP certificate type is not enabled
+by default.
+
 ** libgnutls: Added %NO_EXTENSIONS priority string.
 
 ** libgnutls: Corrected issue in gnutls_record_recv()
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 5c29a71a8c..22641bf1ee 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -486,7 +486,12 @@ static const int mac_priority_secure192[] = {
   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
@@ -681,7 +686,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);
       _set_priority (&(*priority_cache)->supported_ecc, supported_ecc_normal);
       i = 0;
@@ -845,7 +850,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
                 {