[GNUnet-SVN] r30986 - gnunet/src/gns

[gnunet]

Author: grothoff
Date: 2013-11-30 01:03:40 +0100 (Sat, 30 Nov 2013)
New Revision: 30986

Modified:
   gnunet/src/gns/gnunet-gns-proxy.c
Log:
-undo, this was a bit too early

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2013-11-30 00:02:26 UTC (rev 30985)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2013-11-30 00:03:40 UTC (rev 30986)
@@ -813,28 +813,34 @@
 static int
 check_ssl_certificate (struct Socks5Request *s5r)
 {
+  struct curl_tlsinfo tlsinfo;
   unsigned int cert_list_size;
   const gnutls_datum_t *chainp;
-  const struct curl_tlsinfo *tlsinfo;
+  union {
+    struct curl_tlsinfo *tlsinfo;
+    struct curl_slist   *to_slist;
+  } gptr;
   char certdn[GNUNET_DNSPARSER_MAX_NAME_LENGTH + 3];
   size_t size;
   gnutls_x509_crt_t x509_cert;
   int rc;
   const char *name;
 
+  memset (&tlsinfo, 0, sizeof (tlsinfo));
+  gptr.tlsinfo = &tlsinfo;
   if (CURLE_OK !=
       curl_easy_getinfo (s5r->curl,
                         CURLINFO_TLS_SESSION,
-                        &tlsinfo))
+                        &gptr))
     return GNUNET_SYSERR;
-  if (CURLSSLBACKEND_GNUTLS != tlsinfo->ssl_backend)
+  if (CURLSSLBACKEND_GNUTLS != tlsinfo.ssl_backend)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Unsupported CURL SSL backend %d\n"),
-                tlsinfo->ssl_backend);
+                tlsinfo.ssl_backend);
     return GNUNET_SYSERR;
   }
-  chainp = gnutls_certificate_get_peers (tlsinfo->internals, &cert_list_size);
+  chainp = gnutls_certificate_get_peers (tlsinfo.internals, &cert_list_size);
   if ( (! chainp) || (0 == cert_list_size) )
     return GNUNET_SYSERR;