diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-20 14:46:35 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-21 08:57:05 +0000 |
| commit | 9068d833c12cf96bd271cd0f84ec570305622caf (patch) | |
| tree | f2a298d2d2a7fddc40d864c7aa459bec7ddd8feb /main/aiccu/gnutls-3.4.0.patch | |
| parent | a21474d49778ce456079e50f7359a8acaa8ac6a6 (diff) | |
| download | aports-9068d833c12cf96bd271cd0f84ec570305622caf.tar.bz2 aports-9068d833c12cf96bd271cd0f84ec570305622caf.tar.xz | |
aiccu: rebuild against gnutls-3.4
Diffstat (limited to 'main/aiccu/gnutls-3.4.0.patch')
| -rw-r--r-- | main/aiccu/gnutls-3.4.0.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/main/aiccu/gnutls-3.4.0.patch b/main/aiccu/gnutls-3.4.0.patch new file mode 100644 index 0000000000..8eb1e4fa69 --- /dev/null +++ b/main/aiccu/gnutls-3.4.0.patch @@ -0,0 +1,20 @@ +--- aiccu/common/common.c 2015-04-17 23:08:32.543680010 +0200 ++++ aiccu/common/common.c.new 2015-04-17 23:14:02.152457972 +0200 +@@ -272,7 +272,6 @@ + { + #ifdef AICCU_GNUTLS + /* Allow connections to servers that have OpenPGP keys as well */ +- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; + int ret; + #endif /* AICCU_GNUTLS*/ + +@@ -300,8 +299,7 @@ + gnutls_set_default_priority(sock->session); + /* XXX: Return value is not documented in GNUTLS documentation! */ + +- gnutls_certificate_type_set_priority(sock->session, cert_type_priority); +- /* XXX: Return value is not documented in GNUTLS documentation! */ ++ gnutls_priority_set_direct(sock->session, "NORMAL:+CTYPE-OPENPGP", NULL); + + /* Configure the x509 credentials for the current session */ + gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred); |