|
 |
2185427 |
Description: GnuTLS 3.4 compat.
|
|
|
2185427 |
Use GnuTLS priority NORMAL:+CTYPE-OPENPGP instead of deprecated (and removed in GnuTLS 3.4) function gnutls_certificate_type_set_priority.
|
|
|
2185427 |
Author: Andreas Metzler <ametzler@debian.org>
|
|
|
2185427 |
Bug-Debian: https://bugs.debian.org/624056
|
|
|
2185427 |
Origin: vendor
|
|
|
2185427 |
Forwarded: no
|
|
|
2185427 |
Last-Update: 2015-07-25
|
|
|
2185427 |
|
|
|
2185427 |
--- aiccu-20070115.orig/common/common.c
|
|
|
2185427 |
+++ aiccu-20070115/common/common.c
|
|
|
2185427 |
@@ -271,8 +271,6 @@ TLSSOCKET sock_alloc(void);
|
|
|
2185427 |
TLSSOCKET sock_alloc(void)
|
|
|
2185427 |
{
|
|
|
2185427 |
#ifdef AICCU_GNUTLS
|
|
|
2185427 |
- /* Allow connections to servers that have OpenPGP keys as well */
|
|
|
2185427 |
- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
|
|
|
2185427 |
int ret;
|
|
|
2185427 |
#endif /* AICCU_GNUTLS*/
|
|
|
2185427 |
|
|
|
2185427 |
@@ -297,11 +295,8 @@ TLSSOCKET sock_alloc(void)
|
|
|
2185427 |
}
|
|
|
2185427 |
|
|
|
2185427 |
/* Use default priorities */
|
|
|
2185427 |
- gnutls_set_default_priority(sock->session);
|
|
|
2185427 |
- /* XXX: Return value is not documented in GNUTLS documentation! */
|
|
|
2185427 |
-
|
|
|
2185427 |
- gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
|
|
|
2185427 |
- /* XXX: Return value is not documented in GNUTLS documentation! */
|
|
|
2185427 |
+ /* Allow connections to servers that have OpenPGP keys as well */
|
|
|
2185427 |
+ gnutls_priority_set_direct(sock->session, "@SYSTEM", NULL);
|
|
|
2185427 |
|
|
|
2185427 |
/* Configure the x509 credentials for the current session */
|
|
|
2185427 |
gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred);
|