Skip to content

Commit

Permalink
Merge pull request #8 from corthmann/patch-2.2.1
Browse files Browse the repository at this point in the history
Patch 2.2.1
  • Loading branch information
corthmann authored Sep 9, 2018
2 parents f534c4e + 940ae4a commit 56ee81e
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ sudo: false
env:
- "RAILS_VERSION=4.2.8"
rvm:
- 2.0.0
- 2.1.10
- 2.2.7
- 2.3.4
- 2.4.1
- 2.2.10
- 2.3.7
- 2.4.4
- 2.5.1
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### 2.2.1 (2018-09-09)

Changes:

- Fix `OpenSSL::Cipher::Cipher` deprecation warning in `EenyMeeny::Encryptor`.
- Update Travis configuration to include Ruby version 2.2 to 2.5.

### 2.2.0 (2018-07-24)

Features:
Expand Down
2 changes: 1 addition & 1 deletion eeny-meeny.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ require File.expand_path('../lib/eeny-meeny/version', __FILE__)
Gem::Specification.new do |s|
s.name = 'eeny-meeny'
s.version = EenyMeeny::VERSION.dup
s.date = '2018-07-24'
s.date = '2018-09-09'
s.summary = "A simple split and smoke testing tool for Rails"
s.authors = ["Christian Orthmann"]
s.email = '[email protected]'
Expand Down
4 changes: 2 additions & 2 deletions lib/eeny-meeny/models/encryptor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def verify_message(tag, message)
# Encrypts the given message with a random IV, then returns the ciphertext
# with the IV prepended.
def encrypt_message(message)
aes = OpenSSL::Cipher::Cipher.new(@cipher).encrypt
aes = OpenSSL::Cipher.new(@cipher).encrypt
aes.key = @encryption_key
iv = aes.random_iv
aes.iv = iv
Expand All @@ -105,7 +105,7 @@ def encrypt_message(message)
# OpenSSL errors and returns nil. But this should never happen, as the
# verify method should catch all corrupted ciphertexts.
def decrypt_ciphertext(ciphertext)
aes = OpenSSL::Cipher::Cipher.new(@cipher).decrypt
aes = OpenSSL::Cipher.new(@cipher).decrypt
aes.key = @encryption_key
iv = ciphertext[0, aes.iv_len]
aes.iv = iv
Expand Down
2 changes: 1 addition & 1 deletion lib/eeny-meeny/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module EenyMeeny
VERSION = '2.2.0'
VERSION = '2.2.1'
end

0 comments on commit 56ee81e

Please sign in to comment.