From: Steve Holme <steve_holme@hotmail.com>
Date: Thu, 27 Feb 2020 02:01:16 +0000 (+0000)
Subject: gtls: Fixed compilation when using GnuTLS < 3.5.0
X-Git-Tag: curl-7_69_0~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d5893105d554d1792a7cec42038529778ab5e35;p=thirdparty%2Fcurl.git

gtls: Fixed compilation when using GnuTLS < 3.5.0

Reverts the functionality from 41fcb4f when compiling with GnuTLS older
than 3.5.0.

Reviewed-by: Daniel Stenberg
Closes #4984
---

diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index 803d053ec2..5f740eeba1 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -664,7 +664,11 @@ gtls_connect_step1(struct connectdata *conn,
   }
 
   /* Initialize TLS session as a client */
-  init_flags = GNUTLS_CLIENT | GNUTLS_FORCE_CLIENT_CERT;
+  init_flags = GNUTLS_CLIENT;
+
+#if defined(GNUTLS_FORCE_CLIENT_CERT)
+  init_flags |= GNUTLS_FORCE_CLIENT_CERT;
+#endif
 
 #if defined(GNUTLS_NO_TICKETS)
   /* Disable TLS session tickets */