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

[gnunet]

Author: grothoff
Date: 2013-09-18 19:07:54 +0200 (Wed, 18 Sep 2013)
New Revision: 29397

Modified:
   gnunet/src/gns/gnunet-gns-proxy-setup-ca
   gnunet/src/gns/gnunet-gns-proxy.c
Log:
-better error handling, GADS => GNS in CA

Modified: gnunet/src/gns/gnunet-gns-proxy-setup-ca
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy-setup-ca    2013-09-18 16:49:11 UTC (rev 
29396)
+++ gnunet/src/gns/gnunet-gns-proxy-setup-ca    2013-09-18 17:07:54 UTC (rev 
29397)
@@ -1,9 +1,10 @@
+#!/bin/sh
 echo "Generating CA"
 
-openssl req -new -x509 -days 3650 -extensions v3_ca -keyout gnscakey.pem -out 
gnscacert.pem -subj "/C=DE/ST=Bavaria/L=Munich/O=GADS/OU=GNUnet/CN=GADS Proxy 
CA/address@hidden" -passout pass:"GNUnet Naming System"
+openssl req -new -x509 -days 3650 -extensions v3_ca -keyout gnscakey.pem -out 
gnscacert.pem -subj "/C=TNR/L=World/O=GNU/OU=GNUnet/CN=GNS Proxy 
CA/address@hidden" -passout pass:"GNU Name System"
 
 echo "Removing passphrase from key"
-openssl rsa -passin pass:"GNUnet Naming System" -in gnscakey.pem -out 
gnscakeynoenc.pem
+openssl rsa -passin pass:"GNU Name System" -in gnscakey.pem -out 
gnscakeynoenc.pem
 
 cp gnscacert.pem $HOME/.gnunet/gns/gnscert.pem
 cat gnscacert.pem > $HOME/.gnunet/gns/gnsCAcert.pem
@@ -21,8 +22,8 @@
 
 if [ -d ~/.pki/nssdb ]; then
   echo "Importing CA into chrome"
-  certutil -D -n "GADS Proxy CA" -d ~/.pki/nssdb >/dev/null 2&>1
-  certutil -A -n "GADS Proxy CA" -t CT,, -d ~/.pki/nssdb < gnscacert.pem
+  certutil -D -n "GNS Proxy CA" -d ~/.pki/nssdb >/dev/null 2&>1
+  certutil -A -n "GNS Proxy CA" -t CT,, -d ~/.pki/nssdb < gnscacert.pem
 fi
 
 

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2013-09-18 16:49:11 UTC (rev 29396)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2013-09-18 17:07:54 UTC (rev 29397)
@@ -692,7 +692,8 @@
     s5r->curl = NULL;
   }
   curl_slist_free_all (s5r->headers);
-  if (NULL != s5r->response)
+  if ( (NULL != s5r->response) &&
+       (curl_failure_response != s5r->response) )
     MHD_destroy_response (s5r->response);
   if (GNUNET_SCHEDULER_NO_TASK != s5r->rtask)
     GNUNET_SCHEDULER_cancel (s5r->rtask);
@@ -704,7 +705,7 @@
     GNUNET_GNS_lookup_cancel (s5r->gns_lookup);
   if (NULL != s5r->sock) 
   {
-    if (SOCKS5_SOCKET_WITH_MHD == s5r->state)
+    if (SOCKS5_SOCKET_WITH_MHD <= s5r->state)
       GNUNET_NETWORK_socket_free_memory_only_ (s5r->sock);
     else
       GNUNET_NETWORK_socket_close (s5r->sock);
@@ -1238,7 +1239,7 @@
        curl_easy_cleanup (s5r->curl);
        s5r->curl = NULL;
        if (NULL == s5r->response)
-         cleanup_s5r (s5r); /* curl failed to yield response, close Socks 
socket as well */
+         s5r->response = curl_failure_response;
        break;
       case CURLMSG_LAST:
        /* documentation says this is not used */
@@ -1411,7 +1412,6 @@
     curl_easy_setopt (s5r->curl, CURLOPT_HEADERDATA, s5r);
     curl_easy_setopt (s5r->curl, CURLOPT_FOLLOWLOCATION, 0);
     curl_easy_setopt (s5r->curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
-    curl_easy_setopt (s5r->curl, CURLOPT_FAILONERROR, 1); /* not sure we want 
this */
     curl_easy_setopt (s5r->curl, CURLOPT_CONNECTTIMEOUT, 600L);
     curl_easy_setopt (s5r->curl, CURLOPT_TIMEOUT, 600L);
     curl_easy_setopt (s5r->curl, CURLOPT_NOSIGNAL, 1L);