[gnunet] branch master updated: -simplify curl ssl detection

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new f2b92022d -simplify curl ssl detection
f2b92022d is described below

commit f2b92022d8807d2a5baccb9d98002a31b0b797e6
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Sep 8 09:08:46 2022 +0200

    -simplify curl ssl detection
---
 configure.ac               |  3 +--
 src/gns/gnunet-gns-proxy.c | 12 ++++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 34bafc99f..b9cd93a38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,8 +734,7 @@ OLD_LIBS=$LIBS
 LIBS="$LIBS $LIBCURL"
 AC_RUN_IFELSE(
      [AC_LANG_PROGRAM([#include <curl/curl.h>]
-                      [[const curl_ssl_backend **avail;]],
-                      [[return (CURLSSLSET_OK != 
curl_global_sslset(CURLSSLBACKEND_GNUTLS, NULL, &avail)) ? 1 : 0;]])],
+                      [[return (CURLSSLSET_OK != 
curl_global_sslset(CURLSSLBACKEND_GNUTLS, NULL, NULL)) ? 1 : 0;]])],
                     [curl_gnutls=1],
                     [AC_MSG_WARN([cURL does not have GnuTLS backend])
                      curl_gnutls=0])
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 64e60b954..c1db1c61e 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -1265,7 +1265,7 @@ curl_check_hdr (void *buffer,
     GNUNET_free (leho_host);
   }
   else if (0 == strcasecmp (MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
-                       hdr_type))
+                            hdr_type))
   {
     char *leho_host;
 
@@ -1309,7 +1309,7 @@ curl_check_hdr (void *buffer,
                                  s5r->header_tail,
                                  header);
   }
-cleanup:
+  cleanup:
   GNUNET_free (ndup);
   GNUNET_free (new_cookie_hdr);
   GNUNET_free (new_location);
@@ -3801,6 +3801,14 @@ run (void *cls,
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
+  if (CURLSSLSET_OK != curl_global_sslset (CURLSSLBACKEND_GNUTLS,
+                                           NULL,
+                                           NULL))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "cURL does not support the GnuTLS backend\n");
+
+  }
   if (0 != curl_global_init (CURL_GLOBAL_WIN32))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.