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

[gnunet]

Author: schanzen
Date: 2012-06-12 12:41:06 +0200 (Tue, 12 Jun 2012)
New Revision: 21904

Added:
   gnunet/src/gns/gnunet-gns-proxy-setup-ca
Removed:
   gnunet/src/gns/createProxyCa.sh
Modified:
   gnunet/src/gns/gnunet-gns-proxy.c
Log:
-fixes

Deleted: gnunet/src/gns/createProxyCa.sh
===================================================================
--- gnunet/src/gns/createProxyCa.sh     2012-06-12 10:21:55 UTC (rev 21903)
+++ gnunet/src/gns/createProxyCa.sh     2012-06-12 10:41:06 UTC (rev 21904)
@@ -1,20 +0,0 @@
-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=TUM/OU=IN/CN=GNS Proxy 
CA/address@hidden" -passout pass:"GNUnet Naming System"
-
-echo "Removing passphrase from key"
-openssl rsa -passin pass:"GNUnet Naming System" -in gnscakey.pem -out 
gnscakeynoenc.pem
-
-cp gnscacert.pem $HOME/.gnunet/gns/gnscert.pem
-cat gnscacert.pem >> $HOME/.gnunet/gns/gnsCAcert.pem
-cat gnscakeynoenc.pem >> $HOME/.gnunet/gns/gnsCAcert.pem
-cat gnscakey.pem
-cat gnscacert.pem
-
-echo "Cleaning up"
-rm gnscakey.pem gnscakeynoenc.pem gnscacert.pem
-
-echo "Next steps:"
-echo "1. The new CA will be used automatically by the proxy with the default 
settings"
-echo "2. Please import the certificate $HOME/.gnunet/gns/gnscert.pem into the 
browser of your choice"
-echo "3. Start gnunet-gns-proxy and configure your broser to use a SOCKS proxy 
on port 7777"

Copied: gnunet/src/gns/gnunet-gns-proxy-setup-ca (from rev 21902, 
gnunet/src/gns/createProxyCa.sh)
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy-setup-ca                            (rev 0)
+++ gnunet/src/gns/gnunet-gns-proxy-setup-ca    2012-06-12 10:41:06 UTC (rev 
21904)
@@ -0,0 +1,17 @@
+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=TUM/OU=IN/CN=GNS Proxy 
CA/address@hidden" -passout pass:"GNUnet Naming System"
+
+echo "Removing passphrase from key"
+openssl rsa -passin pass:"GNUnet Naming System" -in gnscakey.pem -out 
gnscakeynoenc.pem
+
+cp gnscacert.pem $HOME/.gnunet/gns/gnscert.pem
+cat gnscacert.pem > $HOME/.gnunet/gns/gnsCAcert.pem
+cat gnscakeynoenc.pem >> $HOME/.gnunet/gns/gnsCAcert.pem
+
+rm gnscakey.pem gnscakeynoenc.pem gnscacert.pem
+
+echo "Next steps:"
+echo "1. The new CA will be used automatically by the proxy with the default 
settings"
+echo "2. Please import the certificate $HOME/.gnunet/gns/gnscert.pem into the 
browser of your choice"
+echo "3. Start gnunet-gns-proxy and configure your broser to use a SOCKS proxy 
on port 7777"

Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c   2012-06-12 10:21:55 UTC (rev 21903)
+++ gnunet/src/gns/gnunet-gns-proxy.c   2012-06-12 10:41:06 UTC (rev 21904)
@@ -2380,8 +2380,7 @@
   load_cert_from_file (proxy_ca.cert, cafile);
   load_key_from_file (proxy_ca.key, cafile);
 
-  if (cafile_cfg)
-    GNUNET_free (cafile_cfg);
+  GNUNET_free_non_null (cafile_cfg);
   
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Loading Template\n");