From 3421864c3818bc4872c2f0429ec2a045825767b1 Mon Sep 17 00:00:00 2001 From: Adam Daniels Date: Fri, 10 Jul 2020 11:19:48 -0400 Subject: [PATCH 1/2] Append extension during encryption --- CHANGELOG.md | 4 ++++ cryptr.bash | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cf8d4c..81e9d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ CHANGELOG ========= +## Unreleased + +- 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. diff --git a/cryptr.bash b/cryptr.bash index 6b54223..da05588 100755 --- a/cryptr.bash +++ b/cryptr.bash @@ -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 } From 358f631cbb6282ad47c9c28ac59ae6ece626c50b Mon Sep 17 00:00:00 2001 From: Adam Daniels Date: Fri, 10 Jul 2020 14:57:04 -0400 Subject: [PATCH 2/2] Prepare for 2.1.2 release --- AUTHORS.md | 1 + CHANGELOG.md | 2 +- cryptr.bash | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AUTHORS.md b/AUTHORS.md index 130d0e1..a311e5c 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -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)) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81e9d90..7a4167a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ CHANGELOG ========= -## Unreleased +## 2.1.2 - *7/10/2020* - Append `.aes` file extension instead of substituting when encrypting diff --git a/cryptr.bash b/cryptr.bash index da05588..b4ab755 100755 --- a/cryptr.bash +++ b/cryptr.bash @@ -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() {