>From df5275a504a6d410b084aa9f5023f7638a2731a1 Mon Sep 17 00:00:00 2001 From: Tim Ruehsen Date: Sat, 7 Sep 2013 21:34:37 +0200 Subject: [PATCH] PFS runtime check --- src/ChangeLog | 6 ++++++ src/gnutls.c | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ee7a53e..787c9c6 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 ce61d06..94dfaed 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 (); -- 1.8.4.rc3