2 files changed, 16 insertions, 3 deletions

diff --git a/examples/browser-export.sh b/examples/browser-export.sh
index efb51de..a9173d8 100755
--- a/examples/browser-export.sh
+++ b/examples/browser-export.sh
@@ -16,6 +16,16 @@ extract_public_key()
   certutil -d sql:"$nssdb"  -L -n "$name" -a | openssl x509 -pubkey -noout
 }
 
+extract_private_key()
+{
+  extract_certificate_and_private_key "$@" | openssl rsa -outform PEM
+}
+
+extract_certificate()
+{
+  extract_certificate_and_private_key "$@" | openssl x509
+}
+
 for nssdb in "$HOME/.pki/nssdb" "$HOME"/.mozilla/firefox/*; do
   [ -d "$nssdb" ] || continue
   [ -e "$nssdb"/cert8.db -o -e "$nssdb"/cert9.db ] || continue
@@ -25,7 +35,9 @@ for nssdb in "$HOME/.pki/nssdb" "$HOME"/.mozilla/firefox/*; do
 
 #     certutil -d sql:"$nssdb" -K -n "$name"
 #     extract_public_key "$nssdb" "$name"
-      extract_certificate_and_private_key "$nssdb" "$name"
+#     extract_certificate_and_private_key "$nssdb" "$name"
+      extract_private_key "$nssdb" "$name"
+      extract_certificate "$nssdb" "$name"
 
     done
 done
diff --git a/examples/samizdat-init-key.sh b/examples/samizdat-init-key.sh
index 0bd7a32..1fde8d1 100755
--- a/examples/samizdat-init-key.sh
+++ b/examples/samizdat-init-key.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+export GNUPGHOME=$ROOT/gpg/gnupghome
 
 pem_to_onion_url()
 {
@@ -37,12 +38,12 @@ onion_url=$(pem_to_onion_url "$torkey") || exit
 echo "$passphrase" | \
   kiki --keypairs                                                         \
           strongswan="$ROOT"/etc/ipsec.d/private/"$onion_url".pem{"$ssl"} \
-          ssh-client="$ROOT$HOME"/.ssh/id_rsa{"$ssh"}                     \
+          ssh-client="$ROOT"/root/.ssh/id_rsa{"$ssh"}                     \
           ssh-host="$ROOT"/etc/ssh/ssh_host_rsa_key{"$ssh"}               \
        --passphrase-fd 0  || exit
 
 # Finally, export public keys if they do not exist.
-makepub ssh-client "$ROOT$HOME/.ssh/id_rsa.pub"
+makepub ssh-client "$ROOT/root/.ssh/id_rsa.pub"
 makepub ssh-host   "$ROOT/etc/ssh/ssh_host_rsa_key.pub"
 
 # TODO: makepub can be made obsolete by implementing something like this: