X-Git-Url: http://git.scottworley.com/overonion/blobdiff_plain/c5ab018d697edad35cac84d1146d5b6f76203854..fa1362a5c2ae8208e56ffc7555bbe8903831e70e:/overonion-make-key

diff --git a/overonion-make-key b/overonion-make-key
index 3b0289f..ff09472 100755
--- a/overonion-make-key
+++ b/overonion-make-key
@@ -17,20 +17,25 @@ ciphers=(
 
 umask 077
 
+random_source="/dev/random"
+if [[ "$1" == '--make_INSECURE_key' ]];then
+  shift
+  random_source="/dev/urandom"
+fi
+
 if (( $# != 1));then
-  echo "usage: overonion-make-key keyfile"
+  echo "usage: overonion-make-key keyfile" >&2
   exit 1
 fi
 keyfile=$1
 if [[ -e "$keyfile" ]];then
-  echo "That keyfile already exists.  I refuse to overwrite it."
+  echo "That keyfile already exists.  I refuse to overwrite it." >&2
   exit 1
 fi
 
 i=0
 while read -r cipher;do
-  echo -n $'\r'"Generating key $((++i))/${#ciphers[*]}"
-  sleep 10
-  cat >> "$keyfile" <<< "$cipher $(head -c 99 /dev/random | base64 --wrap=0 )"
+  echo -n $'\r'"Generating key $((++i))/${#ciphers[*]}" >&2
+  cat >> "$keyfile" <<< "openssl-enc $cipher $(head -c 99 "$random_source" | base64 --wrap=0 )"
 done < <( IFS=$'\n'; shuf <<< "${ciphers[*]}"; )
-echo
+echo >&2