diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-11-30 00:02:26 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-11-30 00:02:26 +0000 |
commit | b2f1bcafa32963ef1bbb9c00ea7b75c933c2016e (patch) | |
tree | 213cf86c269c6f61cfae3cb8e350d5ee1eb7f136 /src/gns | |
parent | d3ab6b114ef933c3810919f8bdb9f8c3ceb13774 (diff) | |
download | gnunet-b2f1bcafa32963ef1bbb9c00ea7b75c933c2016e.tar.gz gnunet-b2f1bcafa32963ef1bbb9c00ea7b75c933c2016e.zip |
applying patch from #3148 (by shedatc) to make gnunet-helper-nat-client compile on FreeBSD
Diffstat (limited to 'src/gns')
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index e464ffa3e..38324eb41 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -813,34 +813,28 @@ mhd_content_cb (void *cls, | |||
813 | static int | 813 | static int |
814 | check_ssl_certificate (struct Socks5Request *s5r) | 814 | check_ssl_certificate (struct Socks5Request *s5r) |
815 | { | 815 | { |
816 | struct curl_tlsinfo tlsinfo; | ||
817 | unsigned int cert_list_size; | 816 | unsigned int cert_list_size; |
818 | const gnutls_datum_t *chainp; | 817 | const gnutls_datum_t *chainp; |
819 | union { | 818 | const struct curl_tlsinfo *tlsinfo; |
820 | struct curl_tlsinfo *tlsinfo; | ||
821 | struct curl_slist *to_slist; | ||
822 | } gptr; | ||
823 | char certdn[GNUNET_DNSPARSER_MAX_NAME_LENGTH + 3]; | 819 | char certdn[GNUNET_DNSPARSER_MAX_NAME_LENGTH + 3]; |
824 | size_t size; | 820 | size_t size; |
825 | gnutls_x509_crt_t x509_cert; | 821 | gnutls_x509_crt_t x509_cert; |
826 | int rc; | 822 | int rc; |
827 | const char *name; | 823 | const char *name; |
828 | 824 | ||
829 | memset (&tlsinfo, 0, sizeof (tlsinfo)); | ||
830 | gptr.tlsinfo = &tlsinfo; | ||
831 | if (CURLE_OK != | 825 | if (CURLE_OK != |
832 | curl_easy_getinfo (s5r->curl, | 826 | curl_easy_getinfo (s5r->curl, |
833 | CURLINFO_TLS_SESSION, | 827 | CURLINFO_TLS_SESSION, |
834 | &gptr)) | 828 | &tlsinfo)) |
835 | return GNUNET_SYSERR; | 829 | return GNUNET_SYSERR; |
836 | if (CURLSSLBACKEND_GNUTLS != tlsinfo.ssl_backend) | 830 | if (CURLSSLBACKEND_GNUTLS != tlsinfo->ssl_backend) |
837 | { | 831 | { |
838 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 832 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
839 | _("Unsupported CURL SSL backend %d\n"), | 833 | _("Unsupported CURL SSL backend %d\n"), |
840 | tlsinfo.ssl_backend); | 834 | tlsinfo->ssl_backend); |
841 | return GNUNET_SYSERR; | 835 | return GNUNET_SYSERR; |
842 | } | 836 | } |
843 | chainp = gnutls_certificate_get_peers (tlsinfo.internals, &cert_list_size); | 837 | chainp = gnutls_certificate_get_peers (tlsinfo->internals, &cert_list_size); |
844 | if ( (! chainp) || (0 == cert_list_size) ) | 838 | if ( (! chainp) || (0 == cert_list_size) ) |
845 | return GNUNET_SYSERR; | 839 | return GNUNET_SYSERR; |
846 | 840 | ||