From bde5ecbc66b6bc7e71641adf0d3532c4d1db34b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20L=C3=B3pez?= <ldotlopez@gmail.com>
Date: Wed, 9 Jan 2019 12:55:25 +0100
Subject: [PATCH] Deduplicate openssl cipher name code (and change default
 value)

---
 yadm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/yadm b/yadm
index e912bda..64bf0ea 100755
--- a/yadm
+++ b/yadm
@@ -389,6 +389,15 @@ EOF
 
 }
 
+function _get_openssl_ciphername() {
+    OPENSSL_CIPHERNAME="$(config yadm.openssl-ciphername)"
+    if [ -z "$OPENSSL_CIPHERNAME" ]; then
+      OPENSSL_CIPHERNAME="aes-256-cbc"
+    fi
+
+    echo "$OPENSSL_CIPHERNAME"
+}
+
 function _decrypt_from() {
 
   local output_archive
@@ -410,7 +419,8 @@ function _decrypt_from() {
     openssl)
       require_openssl
 
-      $OPENSSL_PROGRAM enc -d -aes256 -in "$output_archive"
+      OPENSSL_CIPHERNAME="$(_get_openssl_ciphername)"
+      $OPENSSL_PROGRAM enc -d -$OPENSSL_CIPHERNAME -salt -in "$output_archive"
       ;;
 
     *)
@@ -452,13 +462,8 @@ function _encrypt_to() {
     openssl)
       require_openssl
 
-      #; Build openssl options for openssl
-      OPENSSL_CIPHERNAME="$(config yadm.openssl-ciphername)"
-      if [ -z "$OPENSSL_CIPHERNAME" ]; then
-        OPENSSL_CIPHERNAME="aes256"
-      fi
-
-      $OPENSSL_PROGRAM enc -"$OPENSSL_CIPHERNAME" -e -out "$output_archive"
+      OPENSSL_CIPHERNAME="$(_get_openssl_ciphername)"
+      $OPENSSL_PROGRAM enc -e -$OPENSSL_CIPHERNAME -salt -out "$output_archive"
       ;;
 
     *)