Add an operation field to each line.

[overonion] / overonion-make-key

diff --git a/overonion-make-key b/overonion-make-key
index b909d97ff5d24ea6f5c555329f2a8601742df9ef..ff094721f5e03a1a82418c48111c1419e701936a 100755 (executable)
--- a/overonion-make-key
+++ b/overonion-make-key
@@ -17,19 +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[*]}"
-  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