Merge pull request #6 from adam12/encrypted-file-overwrites-source

Append extension during encryption
This commit is contained in:
Justin Keller
2020-07-10 15:41:14 -05:00
committed by GitHub
3 changed files with 8 additions and 3 deletions

View File

@@ -1,2 +1,3 @@
- Justin Keller ([nodesocket](https://github.com/nodesocket))
- Manuel Wildauer ([int9h](https://github.com/int9h))
- Adam Daniels ([adam12](https://github.com/adam12))

View File

@@ -1,6 +1,10 @@
CHANGELOG
=========
## 2.1.2 - *7/10/2020*
- Append `.aes` file extension instead of substituting when encrypting
## 2.1.1 - *3/25/2019*
- Updated the notice text when using environment variable `CRYPTR_PASSWORD` for the password.

View File

@@ -18,7 +18,7 @@
set -eo pipefail; [[ $TRACE ]] && set -x
readonly VERSION="2.1.1"
readonly VERSION="2.1.2"
readonly OPENSSL_CIPHER_TYPE="aes-256-cbc"
cryptr_version() {
@@ -46,9 +46,9 @@ cryptr_encrypt() {
if [[ ! -z "${CRYPTR_PASSWORD}" ]]; then
echo "[notice] using environment variable CRYPTR_PASSWORD for the password"
openssl $OPENSSL_CIPHER_TYPE -salt -pbkdf2 -in "$_file" -out "${_file%\.aes}" -pass env:CRYPTR_PASSWORD
openssl $OPENSSL_CIPHER_TYPE -salt -pbkdf2 -in "$_file" -out "${_file}.aes" -pass env:CRYPTR_PASSWORD
else
openssl $OPENSSL_CIPHER_TYPE -salt -pbkdf2 -in "$_file" -out "${_file%\.aes}"
openssl $OPENSSL_CIPHER_TYPE -salt -pbkdf2 -in "$_file" -out "${_file}.aes"
fi
}