500-gnutls_3.4.patch 803 B

12345678910111213141516171819202122
  1. --- aiccu/common/common.c
  2. +++ aiccu/common/common.c
  3. @@ -271,8 +271,6 @@
  4. TLSSOCKET sock_alloc(void)
  5. {
  6. #ifdef AICCU_GNUTLS
  7. - /* Allow connections to servers that have OpenPGP keys as well */
  8. - const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
  9. int ret;
  10. #endif /* AICCU_GNUTLS*/
  11. @@ -300,7 +298,8 @@
  12. gnutls_set_default_priority(sock->session);
  13. /* XXX: Return value is not documented in GNUTLS documentation! */
  14. - gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
  15. + /* Allow connections to servers that have OpenPGP keys as well */
  16. + gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", NULL);
  17. /* XXX: Return value is not documented in GNUTLS documentation! */
  18. /* Configure the x509 credentials for the current session */