projects / packages / aiccu.git / blame
| Commit | Line | Data |
|---|---|---|
| 3ed092f9 JR |
1 | Description: GnuTLS 3.4 compat. |
| 2 | Use GnuTLS priority NORMAL:+CTYPE-OPENPGP instead of deprecated (and removed in GnuTLS 3.4) function gnutls_certificate_type_set_priority. | |
| 3 | Author: Andreas Metzler <ametzler@debian.org> | |
| 4 | Bug-Debian: https://bugs.debian.org/624056 | |
| 5 | Origin: vendor | |
| 6 | Forwarded: no | |
| 7 | Last-Update: 2015-07-25 | |
| 8 | ||
| 9 | --- aiccu-20070115.orig/common/common.c | |
| 10 | +++ aiccu-20070115/common/common.c | |
| 11 | @@ -271,8 +271,6 @@ TLSSOCKET sock_alloc(void); | |
| 12 | TLSSOCKET sock_alloc(void) | |
| 13 | { | |
| 14 | #ifdef AICCU_GNUTLS | |
| 15 | - /* Allow connections to servers that have OpenPGP keys as well */ | |
| 16 | - const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; | |
| 17 | int ret; | |
| 18 | #endif /* AICCU_GNUTLS*/ | |
| 19 | ||
| 20 | @@ -297,11 +295,10 @@ TLSSOCKET sock_alloc(void) | |
| 21 | } | |
| 22 | ||
| 23 | /* Use default priorities */ | |
| 24 | - gnutls_set_default_priority(sock->session); | |
| 25 | - /* XXX: Return value is not documented in GNUTLS documentation! */ | |
| 26 | - | |
| 27 | - gnutls_certificate_type_set_priority(sock->session, cert_type_priority); | |
| 28 | - /* XXX: Return value is not documented in GNUTLS documentation! */ | |
| 29 | + /* Allow connections to servers that have OpenPGP keys as well */ | |
| 30 | + gnutls_priority_set_direct(sock->session, | |
| 31 | + "NORMAL:+CTYPE-OPENPGP", | |
| 32 | + NULL); | |
| 33 | ||
| 34 | /* Configure the x509 credentials for the current session */ | |
| 35 | gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred); |