gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

TLSClient: No longer calls gnutls_global_{de,}init for 3.3.0+

Browse Source
This commit is contained in:
Paul Beckingham
2016-11-06 01:04:36 -04:00
parent bcfebffa7f
commit 688d6b658b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/TLSClient.cpp
View File

@@ -86,7 +86,9 @@ TLSClient::~TLSClient ()
{ {
gnutls_deinit (_session); gnutls_deinit (_session);
gnutls_certificate_free_credentials (_credentials); gnutls_certificate_free_credentials (_credentials);
#if GNUTLS_VERSION_NUMBER < 0x030300
gnutls_global_deinit (); gnutls_global_deinit ();
#endif
if (_socket) if (_socket)
{ {
@@ -144,9 +146,12 @@ void TLSClient::init (
_cert = cert; _cert = cert;
_key = key; _key = key;
int ret = gnutls_global_init (); int ret;
#if GNUTLS_VERSION_NUMBER < 0x030300
ret = gnutls_global_init ();
if (ret < 0) if (ret < 0)
throw format ("TLS init error. {1}", gnutls_strerror (ret)); throw format ("TLS init error. {1}", gnutls_strerror (ret));
#endif
ret = gnutls_certificate_allocate_credentials (&_credentials); ret = gnutls_certificate_allocate_credentials (&_credentials);
if (ret < 0) if (ret < 0)