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

[gnunet]

Author: schanzen
Date: 2012-06-12 13:17:11 +0200 (Tue, 12 Jun 2012)
New Revision: 21908

Modified:
   gnunet/src/gns/Makefile.am
   gnunet/src/gns/gnunet-gns-proxy-setup-ca
Log:
autoimport CA

Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am  2012-06-12 10:57:27 UTC (rev 21907)
+++ gnunet/src/gns/Makefile.am  2012-06-12 11:17:11 UTC (rev 21908)
@@ -37,6 +37,8 @@
        $(DO_PROXY) \
   gnunet-gns
 
+bin_SCRIPTS=gnunet-gns-proxy-setup-ca
+
 check_PROGRAMS = \
   test_gns_simple_shorten \
   test_gns_simple_get_authority \

Modified: gnunet/src/gns/gnunet-gns-proxy-setup-ca
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy-setup-ca    2012-06-12 10:57:27 UTC (rev 
21907)
+++ gnunet/src/gns/gnunet-gns-proxy-setup-ca    2012-06-12 11:17:11 UTC (rev 
21908)
@@ -9,9 +9,23 @@
 cat gnscacert.pem > $HOME/.gnunet/gns/gnsCAcert.pem
 cat gnscakeynoenc.pem >> $HOME/.gnunet/gns/gnsCAcert.pem
 
+echo "Importing CA into browsers"
+for f in ~/.mozilla/firefox/*.default
+do
+  if [ -d $f ]; then
+    echo "Importing CA info firefox $f"
+    certutil -D -n "GNS Proxy CA" -d ~/.mozilla/firefox/*.default >/dev/null 
2&>1
+    certutil -A -n "GNS Proxy CA" -t CT,, -d ~/.mozilla/firefox/*.default < 
gnscacert.pem
+  fi
+done
+
+if [ -d ~/.pki/nssdb ]; then
+  echo "Importing CA into chrome"
+  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
+
+
 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 browser to use a SOCKS 
proxy on port 7777"
+echo "You can now start gnunet-gns-proxy and configure your browser to use a 
SOCKS proxy on port 7777"