diff --git a/src/cache.sh b/src/cache.sh index db4b1c6..fc4131e 100644 --- a/src/cache.sh +++ b/src/cache.sh @@ -2,7 +2,7 @@ ## Cache functions get_filecache() { - echo "$cachepath/$(filehash).tar.gpg" + echo "$cachepath/$(filehash)$ZPASS_EXTENSION" } diff --git a/src/config.sh b/src/config.sh index 9895f4c..b052ec3 100644 --- a/src/config.sh +++ b/src/config.sh @@ -28,7 +28,7 @@ cachepath=${ZPASS_CACHE_PATH-$cachepath} # default ZPASS ZPASS_FILE=${ZPASS_FILE-default} -ZPASS_EXTENSION=${ZPASS_EXTENSION-.tar.gpg} +ZPASS_EXTENSION=${ZPASS_EXTENSION-.tgz.enc} ZPASS_KEY_CACHE_TIME=${ZPASS_KEY_CACHE_TIME-60} ZPASS_CLIPBOARD_TIME=${ZPASS_CLIPBOARD_TIME-30} ZPASS_UNK_OP_CALL=${ZPASS_UNK_OP_CALL-copy} diff --git a/src/crypt.sh b/src/crypt.sh index 1e973ce..0f3e16e 100644 --- a/src/crypt.sh +++ b/src/crypt.sh @@ -2,13 +2,15 @@ # $1 = key encrypt() { - gpg --pinentry-mode loopback --batch --passphrase "$1" -o - -c - + gzip | openssl enc -aes-256-cbc -pbkdf2 -salt -in - -out - -k "$1" } # $1 = key , $2 = keyfile to write decrypt_with_key() { - gpg --pinentry-mode loopback --batch --passphrase "$1" -o - -d "$file" 2>/dev/null || return $? + { + openssl enc -d -aes-256-cbc -pbkdf2 -in "$file" -out - -k "$1" || return $? + } | gzip -d [ -n "$2" ] && echo "$1" > "$2" return 0 }