+2011-08-10 Giuseppe Scrivano <gscrivano@gnu.org>
+
+ * configure.ac: Check for `gnutls_priority_set_direct' when gnutls is
+ used.
+ Reported by: Karl Berry<karl@freefriends.org>
+
2011-08-09 Giuseppe Scrivano <gscrivano@southpole.se>
* build-aux/bzr-version-gen: Fix some portability issues.
else
AC_MSG_ERROR([--with-ssl was given, but GNUTLS is not available.])
fi
+
+ AC_CHECK_FUNCS(gnutls_priority_set_direct)
]) # endif: --with-ssl == no?
]) # endif: --with-ssl == openssl?
+2011-08-10 Giuseppe Scrivano <gscrivano@gnu.org>
+
+ Fix a linker error on systems with an older gnutls version.
+ * gnutls.c (ssl_connect_wget)
+ [HAVE_GNUTLS_PRIORITY_SET_DIRECT]: Use gnutls_priority_set_direct.
+ [! HAVE_GNUTLS_PRIORITY_SET_DIRECT]: Use gnutls_protocol_set_priority.
+ Reported by: Karl Berry<karl@freefriends.org>
+
2011-08-06 Jochen Roderburg <Roderburg@Uni-Koeln.DE>
* host.c (lookup_host): Ensure it doesn't print more IPs than available
else
read = gnutls_record_recv (ctx->session, buf + offset,
bufsize - offset);
-
+
if (read < 0)
{
if (offset)
gnutls_transport_set_ptr (session, (gnutls_transport_ptr) FD_TO_SOCKET (fd));
err = 0;
+#if HAVE_GNUTLS_PRIORITY_SET_DIRECT
switch (opt.secure_protocol)
{
case secure_protocol_auto:
default:
abort ();
}
+#else
+ int allowed_protocols[4] = {0, 0, 0, 0};
+ switch (opt.secure_protocol)
+ {
+ case secure_protocol_auto:
+ break;
+ case secure_protocol_sslv2:
+ case secure_protocol_sslv3:
+ allowed_protocols[0] = GNUTLS_SSL3;
+ err = gnutls_protocol_set_priority (session, allowed_protocols);
+ break;
+
+ case secure_protocol_tlsv1:
+ allowed_protocols[0] = GNUTLS_TLS1_0;
+ allowed_protocols[1] = GNUTLS_TLS1_1;
+ allowed_protocols[2] = GNUTLS_TLS1_2;
+ err = gnutls_protocol_set_priority (session, allowed_protocols);
+ break;
+
+ default:
+ abort ();
+ }
+#endif
+
if (err < 0)
{
logprintf (LOG_NOTQUIET, "GnuTLS: %s\n", gnutls_strerror (err));