zawz/zpass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore(crypt): switch to use openssl

Browse source
This commit is contained in:
zawz 2022-02-18 17:45:26 +01:00
parent 804780df8b
commit a3158b5c51
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cache.sh
View file

@ -2,7 +2,7 @@
## Cache functions ## Cache functions
get_filecache() { get_filecache() {
echo "$cachepath/$(filehash).tar.gpg" echo "$cachepath/$(filehash)$ZPASS_EXTENSION"
} }

2
src/config.sh
View file

@ -28,7 +28,7 @@ cachepath=${ZPASS_CACHE_PATH-$cachepath}
# default ZPASS # default ZPASS
ZPASS_FILE=${ZPASS_FILE-default} 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_KEY_CACHE_TIME=${ZPASS_KEY_CACHE_TIME-60}
ZPASS_CLIPBOARD_TIME=${ZPASS_CLIPBOARD_TIME-30} ZPASS_CLIPBOARD_TIME=${ZPASS_CLIPBOARD_TIME-30}
ZPASS_UNK_OP_CALL=${ZPASS_UNK_OP_CALL-copy} ZPASS_UNK_OP_CALL=${ZPASS_UNK_OP_CALL-copy}

6
src/crypt.sh
View file

@ -2,13 +2,15 @@
# $1 = key # $1 = key
encrypt() { 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 # $1 = key , $2 = keyfile to write
decrypt_with_key() 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" [ -n "$2" ] && echo "$1" > "$2"
return 0 return 0
} }