diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-08-31 16:48:19 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-08-31 16:48:19 +0200 |
| commit | d1b1294cc53a8efb069fc9454370f74cca72fef2 (patch) | |
| tree | 491ff6fc661716d756a48542fed07b03c859dcab /lib | |
| parent | 022ad1ceabc50ea3244a03d669b1536c78e40fd7 (diff) | |
| download | gnutls-d1b1294cc53a8efb069fc9454370f74cca72fef2.tar.gz | |
OpenPGP certificate type is not enabled by default.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gnutls_priority.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c index 8f592070f2..bd8cb5af04 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 { |