From 6098f766161483ff78255c7b107affe87946a255 Mon Sep 17 00:00:00 2001
From: Tim Byrne <sultan@locehilios.com>
Date: Fri, 17 Jul 2020 14:43:29 -0500
Subject: [PATCH] Set default cipher in only one place

---
 yadm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/yadm b/yadm
index 01b30ce..011a6ba 100755
--- a/yadm
+++ b/yadm
@@ -922,16 +922,20 @@ function _get_openssl_ciphername() {
   echo "$OPENSSL_CIPHERNAME"
 }
 
-function _decrypt_from() {
-
-  local output_archive
+function _get_cipher() {
   output_archive="$1"
-
-  local yadm_cipher
   yadm_cipher="$(config yadm.cipher)"
   if [ -z "$yadm_cipher" ]; then
       yadm_cipher="gpg"
   fi
+}
+
+
+function _decrypt_from() {
+
+  local output_archive
+  local yadm_cipher
+  _get_cipher "$1"
 
   case "$yadm_cipher" in
     gpg)
@@ -958,13 +962,8 @@ function _decrypt_from() {
 function _encrypt_to() {
 
   local output_archive
-  output_archive="$1"
-
   local yadm_cipher
-  yadm_cipher="$(config yadm.cipher)"
-  if [ -z "$yadm_cipher" ]; then
-      yadm_cipher="gpg"
-  fi
+  _get_cipher "$1"
 
   case "$yadm_cipher" in
     gpg)