autoimport CA

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 0513dfe82cbffb4f6a5fabf402c07310e3c35b8f..2e5aa193ab723c375a964fc950b8fc63bdf5130e 100644 (file)
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -37,6 +37,8 @@ bin_PROGRAMS = \
        $(DO_PROXY) \
   gnunet-gns
 
+bin_SCRIPTS=gnunet-gns-proxy-setup-ca
+
 check_PROGRAMS = \
   test_gns_simple_shorten \
   test_gns_simple_get_authority \

diff --git a/src/gns/gnunet-gns-proxy-setup-ca b/src/gns/gnunet-gns-proxy-setup-ca
index e25ccfc6cdbb6f9cd6d8c1f6c0ebb5543e57ff9f..5071235943e173efb8072df08dcfb74af0033610 100644 (file)
--- a/src/gns/gnunet-gns-proxy-setup-ca
+++ b/src/gns/gnunet-gns-proxy-setup-ca
@@ -9,9 +9,23 @@ cp gnscacert.pem $HOME/.gnunet/gns/gnscert.pem
 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"