From 07df492a1f67a30baaddf231db23557fdb369e61 Mon Sep 17 00:00:00 2001 From: Justin Date: Mon, 25 Mar 2019 22:42:25 -0500 Subject: [PATCH] version release 2.1.1 --- CHANGELOG.md | 6 ++++++ LICENSE.txt | 2 +- README.md | 24 ++++++++++++------------ cryptr.bash | 8 ++++---- tests/test.bash | 2 +- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5d0125..f612bc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ CHANGELOG ========= +## 2.1.1 - *3/25/2019* + +- Updated the notice text when using environment variable CRYPTR_PASSWORD for the password. +- Updated `tests/test.bash`. +- Bump copyright year to 2019. + ## 2.1.0 - *10/4/2017* - You may now define the password to use when encrypting and decrypting using the `CRYPTR_PASSWORD` environment variable. This change enables non-interactive/batch operations. diff --git a/LICENSE.txt b/LICENSE.txt index f095d3f..73512ec 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2017 Justin Keller + Copyright 2019 Justin Keller Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/README.md b/README.md index e4794d9..1fb4628 100644 --- a/README.md +++ b/README.md @@ -20,21 +20,21 @@ Add `tools/cryptr-bash-completion.bash` to your tab completion file directory. > encrypt \ - Encryptes file with OpenSSL AES-256 cipher block chaining. Writes an encrypted file out *(ciphertext)* appending `.aes` extension. ``` -➜ cryptr encrypt ./secrets-file +➜ cryptr encrypt ./secret-file enter aes-256-cbc encryption password: Verifying - enter aes-256-cbc encryption password: ``` ``` ➜ ls -alh --rw-r--r-- 1 user group 1.0G Oct 1 13:33 secrets-file --rw-r--r-- 1 user group 1.0G Oct 1 13:34 secrets-file.aes +-rw-r--r-- 1 user group 1.0G Oct 1 13:33 secret-file +-rw-r--r-- 1 user group 1.0G Oct 1 13:34 secret-file.aes ``` You may optionally define the password to use when encrypting using the `CRYPTR_PASSWORD` environment variable. This enables non-interactive/batch operations. ``` -➜ CRYPTR_PASSWORD=A1EO7S9SsQYcPChOr47n cryptr encrypt ./secrets-file +➜ CRYPTR_PASSWORD=A1EO7S9SsQYcPChOr47n cryptr encrypt ./secret-file ``` ### decrypt @@ -43,24 +43,24 @@ You may optionally define the password to use when encrypting using the `CRYPTR_ ``` ➜ ls -alh --rw-r--r-- 1 user group 1.0G Oct 1 13:34 secrets-file.aes +-rw-r--r-- 1 user group 1.0G Oct 1 13:34 secret-file.aes ``` ``` -➜ cryptr decrypt ./secrets-file.aes +➜ cryptr decrypt ./secret-file.aes enter aes-256-cbc decryption password: ``` ``` ➜ ls -alh --rw-r--r-- 1 user group 1.0G Oct 1 13:35 secrets-file --rw-r--r-- 1 user group 1.0G Oct 1 13:34 secrets-file.aes +-rw-r--r-- 1 user group 1.0G Oct 1 13:35 secret-file +-rw-r--r-- 1 user group 1.0G Oct 1 13:34 secret-file.aes ``` You may optionally define the password to use when decrypting using the `CRYPTR_PASSWORD` environment variable. This enables non-interactive/batch operations. ``` -➜ CRYPTR_PASSWORD=A1EO7S9SsQYcPChOr47n cryptr decrypt ./secrets-file.aes +➜ CRYPTR_PASSWORD=A1EO7S9SsQYcPChOr47n cryptr decrypt ./secret-file.aes ``` ### help @@ -84,7 +84,7 @@ Usage: cryptr command ``` ➜ cryptr version -cryptr 2.1.0 +cryptr 2.1.1 ``` ### default @@ -93,7 +93,7 @@ cryptr 2.1.0 ``` ➜ cryptr -cryptr 2.1.0 +cryptr 2.1.1 Usage: cryptr command @@ -130,7 +130,7 @@ For more information on semantic versioning, visit http://semver.org/. ## License & Legal -Copyright 2017 Justin Keller +Copyright 2019 Justin Keller Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/cryptr.bash b/cryptr.bash index e4958f1..e53ace8 100755 --- a/cryptr.bash +++ b/cryptr.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash ############################################################################### -# Copyright 2017 Justin Keller +# Copyright 2019 Justin Keller # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ set -eo pipefail; [[ $TRACE ]] && set -x -readonly VERSION="2.1.0" +readonly VERSION="2.1.1" readonly OPENSSL_CIPHER_TYPE="aes-256-cbc" cryptr_version() { @@ -45,7 +45,7 @@ cryptr_encrypt() { fi if [[ ! -z "${CRYPTR_PASSWORD}" ]]; then - echo "Using environment variable CRYPTR_PASSWORD for the password" + echo "[notice] using environment variable CRYPTR_PASSWORD for the password" openssl $OPENSSL_CIPHER_TYPE -salt -in "$_file" -out "$_file".aes -pass env:CRYPTR_PASSWORD else openssl $OPENSSL_CIPHER_TYPE -salt -in "$_file" -out "$_file".aes @@ -60,7 +60,7 @@ local _file="$1" fi if [[ ! -z "${CRYPTR_PASSWORD}" ]]; then - echo "Using environment variable CRYPTR_PASSWORD for the password" + echo "[notice] using environment variable CRYPTR_PASSWORD for the password" openssl $OPENSSL_CIPHER_TYPE -d -salt -in "$_file" -out "${_file%\.aes}" -pass env:CRYPTR_PASSWORD else openssl $OPENSSL_CIPHER_TYPE -d -salt -in "$_file" -out "${_file%\.aes}" diff --git a/tests/test.bash b/tests/test.bash index 061df27..2d0736d 100755 --- a/tests/test.bash +++ b/tests/test.bash @@ -2,7 +2,7 @@ set -eo pipefail; [[ $TRACE ]] && set -x plaintext=$(mktemp /tmp/cryptr.XXXXXXXX) -dd if=/dev/urandom bs=4096 count=1 2> /dev/null | LC_ALL=C tr -dc 'A-Za-z0-9' | head -c512 > "$plaintext" +dd if=/dev/urandom bs=4096 count=256 2> /dev/null | LC_ALL=C tr -dc 'A-Za-z0-9' | head -c262144 > "$plaintext" plaintext_sha=($(openssl dgst -sha256 "$plaintext")) export CRYPTR_PASSWORD