aboutsummaryrefslogtreecommitdiff
path: root/src/gns
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2016-08-31 15:42:39 +0000
committerMartin Schanzenbach <mschanzenbach@posteo.de>2016-08-31 15:42:39 +0000
commitf082aaf7f59380121e94f23f60b0b06a29b99374 (patch)
tree3e19f763a5fdfc1274e5a70afa531d0def29de6b /src/gns
parentee0596a547c5de4b14209b103d9d413ccbab9d2b (diff)
downloadgnunet-f082aaf7f59380121e94f23f60b0b06a29b99374.tar.gz
gnunet-f082aaf7f59380121e94f23f60b0b06a29b99374.zip
-only check ssl cert once
Diffstat (limited to 'src/gns')
-rw-r--r--src/gns/gnunet-gns-proxy.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 3a74a4b19..052b06f1c 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -875,7 +875,7 @@ check_ssl_certificate (struct Socks5Request *s5r)
875 const char *name; 875 const char *name;
876 876
877 s5r->ssl_checked = GNUNET_YES; 877 s5r->ssl_checked = GNUNET_YES;
878 878 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "XXXXXX\n");
879 if (CURLE_OK != 879 if (CURLE_OK !=
880 curl_easy_getinfo (s5r->curl, 880 curl_easy_getinfo (s5r->curl,
881 CURLINFO_TLS_SESSION, 881 CURLINFO_TLS_SESSION,
@@ -1041,10 +1041,12 @@ curl_check_hdr (void *buffer, size_t size, size_t nmemb, void *cls)
1041 char *tok; 1041 char *tok;
1042 1042
1043 /* first, check SSL certificate */ 1043 /* first, check SSL certificate */
1044 if ( (GNUNET_YES != s5r->ssl_checked) && 1044 if ((GNUNET_YES != s5r->ssl_checked) &&
1045 (HTTPS_PORT == s5r->port) && 1045 (HTTPS_PORT == s5r->port))
1046 (GNUNET_OK != check_ssl_certificate (s5r)) ) 1046 {
1047 return GNUNET_SYSERR; 1047 if (GNUNET_OK != check_ssl_certificate (s5r))
1048 return 0;
1049 }
1048 1050
1049 ndup = GNUNET_strndup (buffer, bytes); 1051 ndup = GNUNET_strndup (buffer, bytes);
1050 hdr_type = strtok (ndup, ":"); 1052 hdr_type = strtok (ndup, ":");
@@ -1775,7 +1777,6 @@ create_response (void *cls,
1775 *upload_data_size -= left; 1777 *upload_data_size -= left;
1776 GNUNET_assert (NULL != s5r->curl); 1778 GNUNET_assert (NULL != s5r->curl);
1777 curl_easy_pause (s5r->curl, CURLPAUSE_CONT); 1779 curl_easy_pause (s5r->curl, CURLPAUSE_CONT);
1778 curl_download_prepare ();
1779 return MHD_YES; 1780 return MHD_YES;
1780 } 1781 }
1781 if (SOCKS5_SOCKET_UPLOAD_STARTED == s5r->state) 1782 if (SOCKS5_SOCKET_UPLOAD_STARTED == s5r->state)
@@ -1783,7 +1784,6 @@ create_response (void *cls,
1783 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1784 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1784 "Finished processing UPLOAD\n"); 1785 "Finished processing UPLOAD\n");
1785 s5r->state = SOCKS5_SOCKET_UPLOAD_DONE; 1786 s5r->state = SOCKS5_SOCKET_UPLOAD_DONE;
1786 curl_download_prepare ();
1787 } 1787 }
1788 if (NULL == s5r->response) 1788 if (NULL == s5r->response)
1789 return MHD_YES; 1789 return MHD_YES;