Move hash initiation into overonion-make-key

[overonion] / overonion-make-key

diff --git a/overonion-make-key b/overonion-make-key
index 5c702757cc1b96612da927992ff3dff14e5776b5..0e588b26a09c28494cff141d5430e58247e7a5d5 100755 (executable)
--- a/overonion-make-key
+++ b/overonion-make-key
@@ -16,6 +16,9 @@ ciphers=(
   aes-192-cbc aes-192-cfb aes-192-cfb1 aes-192-cfb8 aes-192-ecb aes-192-ofb
   aes-256-cbc aes-256-cfb aes-256-cfb1 aes-256-cfb8 aes-256-ecb aes-256-ofb
 )
   aes-192-cbc aes-192-cfb aes-192-cfb1 aes-192-cfb8 aes-192-ecb aes-192-ofb
   aes-256-cbc aes-256-cfb aes-256-cfb1 aes-256-cfb8 aes-256-ecb aes-256-ofb
 )

+hashes=(
+  sha sha1 mdc2 ripemd160 sha224 sha256 sha384 sha512 md4 md5 dss1
+)

 
 umask 077
 
 
 umask 077
 


@@ -45,10 +48,18 @@ function generate_keys() {
   done < <( IFS=$'\n'; shuf <<< "${ciphers[*]}"; )
 }
 
   done < <( IFS=$'\n'; shuf <<< "${ciphers[*]}"; )
 }
 

+function generate_hashes() {
+  while read -r hash;do
+    echo "openssl-dgst $hash"
+  done < <( IFS=$'\n'; shuf <<< "${hashes[*]}"; )
+}
+

 {
 {

+  generate_hashes

   generate_keys
   echo "reverse"
   generate_keys
   generate_keys
   echo "reverse"
   generate_keys

+  generate_hashes

 } > "$keyfile"
 
 echo 2>&1
 } > "$keyfile"
 
 echo 2>&1