set -e doesn't catch failures inside <()

[overonion] / overonion-make-key

diff --git a/overonion-make-key b/overonion-make-key
index b909d97ff5d24ea6f5c555329f2a8601742df9ef..7d0ff1ac6b69d9d61ef57c6ec594f1261e0174ce 100755 (executable)
--- a/overonion-make-key
+++ b/overonion-make-key
@@ -17,19 +17,36 @@ ciphers=(
 
 umask 077
 
 
 umask 077
 

+random_source="/dev/random"
+if [[ "$1" == '--make_INSECURE_key' ]];then
+  shift
+  random_source="/dev/urandom"
+fi
+

 if (( $# != 1));then
 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
   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
 
   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 )"
-done < <( IFS=$'\n'; shuf <<< "${ciphers[*]}"; )
-echo
+keys_needed=$((${#ciphers[*]} * 2))
+keys_generated=0
+
+function generate_keys() {
+  while read -r cipher;do
+    echo -n $'\r'"Generating key $((++keys_generated))/$keys_needed" >&2
+    echo "openssl-enc $cipher $(head -c 99 "$random_source" | base64 --wrap=0 )"
+  done < <( IFS=$'\n'; shuf <<< "${ciphers[*]}"; )
+}
+
+{
+  generate_keys
+  echo "reverse"
+  generate_keys
+} > "$keyfile"
+
+echo 2>&1