Updated to work with ruby 2.5.0

aion-dk · Aug 21, 2018 · 118218a · 118218a
1 parent fafe4e9
commit 118218a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-Enigma
+AionEnigma
 ======
 
-Enigma is a small utility for encrypting/decrypting a string based on a shared secret using AES-265-CBC.
+AionEnigma is a small utility for encrypting/decrypting a string based on a shared secret using AES-265-CBC.
 
 Install
 -------
@@ -18,9 +18,9 @@ Usage
 secret_message = 'this is a secret message'
 shared_secret  = 'some shared secret'
 
-enigma = Enigma.new(shared_secret)
+enigma = AionEnigma.new(shared_secret)
 encrypted_message = enigma.encrypt(secret_message)
-# encrypted_message ≈> 'Gn3AZKG9aqv+ALTfI9ZbuQ==|7hI5iN1Jdm73zQB1nTBngX07SaX60nuirWQRtNygIgE='
+# encrypted_message ≈> 'ivBsGDsQjG6ScC5wq7Q-2w~XgFz1c4mdDR_MhI0VkpvNMcINDHCrAXEb1RlzwXpuNU'
 
 message = enigma.decrypt(encrypted_message)
 # message => 'this is a secret message'

diff --git a/lib/aion-enigma.rb b/lib/aion-enigma.rb
@@ -1 +1 @@
-require 'enigma'
+require 'aion_enigma'
diff --git a/lib/enigma.rb → lib/aion_enigma.rb b/lib/enigma.rb → lib/aion_enigma.rb
@@ -1,7 +1,7 @@
 require 'openssl'
 require 'base64'
 
-class Enigma
+class AionEnigma
 
   class EncryptError < StandardError; end
   class DecryptError < StandardError; end
@@ -12,7 +12,7 @@ def initialize(secret)
     unless secret.is_a? String
       fail ArgumentError, 'secret must be a string'
     end
-    @key = Digest::SHA1.hexdigest(secret)
+    @key = Digest::SHA2.digest(secret)
   end
 
   # Encrypts a string.
@@ -89,7 +89,7 @@ def decrypt(encrypted_message)
   # @param encrypted the encrypted bytes
   # @return String with serialized iv and encrypted parameters
   def pack(iv, encrypted)
-    [iv, encrypted].map { |x| Base64.encode64(x).strip }.join('|')
+    [iv, encrypted].map { |x| Base64.urlsafe_encode64(x).gsub('=','') }.join('~')
   end
 
   # Unpacking the encrypted_message into an array of iv and encrypted data.
@@ -103,7 +103,7 @@ def pack(iv, encrypted)
   # @param encrypted_message as outputted by Enigma#pack
   # @return Array containing iv bytes and encrypted bytes
   def unpack(encrypted_message)
-    encrypted_message.split('|').map { |m| Base64.decode64(m) }
+    encrypted_message.split('~').map { |m| Base64.urlsafe_decode64(m) }
   end
 
 end

diff --git a/test/enigma_test.rb → test/aion_enigma_test.rb b/test/enigma_test.rb → test/aion_enigma_test.rb
@@ -1,16 +1,16 @@
 require 'minitest/autorun'
-require 'enigma'
+require 'aion_enigma'
 
-class EnigmaTest < Minitest::Test
+class AionEnigmaTest < Minitest::Test
 
   def setup
     @secret = 'some shared secret'
-    @enigma = Enigma.new(@secret)
+    @enigma = AionEnigma.new(@secret)
   end
 
   def test_non_string_secret
     assert_raises ArgumentError do
-      Enigma.new({})
+      AionEnigma.new({})
     end
   end
 
@@ -50,8 +50,8 @@ def test_decrypt
   def test_other_enigma
     secret = 'shared secret for testing 123'
 
-    enigma1 = Enigma.new(secret)
-    enigma2 = Enigma.new(secret)
+    enigma1 = AionEnigma.new(secret)
+    enigma2 = AionEnigma.new(secret)
 
     message_in        = 'this is a string to encrypt'
     encrypted_message = enigma1.encrypt(message_in)
@@ -61,13 +61,13 @@ def test_other_enigma
   end
 
   def test_secret_mismatch
-    enigma1 = Enigma.new('secret 1')
-    enigma2 = Enigma.new('secret 2')
+    enigma1 = AionEnigma.new('secret 1')
+    enigma2 = AionEnigma.new('secret 2')
 
     message_in        = 'testing mismatch'
     encrypted_message = enigma1.encrypt(message_in)
 
-    assert_raises Enigma::DecryptError do
+    assert_raises AionEnigma::DecryptError do
       enigma2.decrypt(encrypted_message)
     end
   end
@@ -76,9 +76,9 @@ def test_readme_example
     secret_message = 'this is a secret message'
     shared_secret  = 'some shared secret'
 
-    enigma = Enigma.new(shared_secret)
+    enigma = AionEnigma.new(shared_secret)
     encrypted_message = enigma.encrypt(secret_message)
-    # encrypted_message ≈> 'Gn3AZKG9aqv+ALTfI9ZbuQ==|7hI5iN1Jdm73zQB1nTBngX07SaX60nuirWQRtNygIgE='
+    # encrypted_message ≈> 'ivBsGDsQjG6ScC5wq7Q-2w~XgFz1c4mdDR_MhI0VkpvNMcINDHCrAXEb1RlzwXpuNU'
 
     message = enigma.decrypt(encrypted_message)
     # message => 'this is a secret message'