diff --git a/src/ChangeLog b/src/ChangeLog index ee7a53e4..787c9c60 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2013-09-07 Tim Ruehsen + + * gnutls.c (ssl_connect_wget): use gnutls_check_version() + to check if option "PFS" is available + Reported by: Daniel Kahn Gillmor + 2013-09-03 Tim Ruehsen * main.c: Add new value 'PFS' to --secure-protocol to diff --git a/src/gnutls.c b/src/gnutls.c index ce61d065..94dfaedd 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -443,11 +443,10 @@ ssl_connect_wget (int fd, const char *hostname) err = gnutls_priority_set_direct (session, "NORMAL:-VERS-SSL3.0", NULL); break; case secure_protocol_pfs: -#if defined (GNUTLS_VERSION_NUMBER) && GNUTLS_VERSION_NUMBER >= 0x030204 - err = gnutls_priority_set_direct (session, "PFS", NULL); -#else - err = gnutls_priority_set_direct (session, "NORMAL:-RSA", NULL); -#endif + if (gnutls_check_version("3.2.4")) + err = gnutls_priority_set_direct (session, "PFS", NULL); + else + err = gnutls_priority_set_direct (session, "NORMAL:-RSA", NULL); break; default: abort ();