test/cipher_encryption_test.rb in polarssl-0.0.7 vs test/cipher_encryption_test.rb in polarssl-1.0.0

@@ -1,74 +1,40 @@
 require 'test_helper'
 require 'base64'
 require 'securerandom'
 
 class CipherTest < MiniTest::Unit::TestCase
+  CIPHER = 'AES-128-CTR'
+  VALUE = 'test data value'
+  KEY = 'bar'
 
   def test_aes_128_ctr_encrypt
-    # These are hex-formatted strings that come from NIST Special Publication 800-38A 2001 Edition:
-    # Recommendation for Block Cipher Modes of Operation, Methods and Techniques by Morris Dworkin.
-    key = hex_to_bin("2b7e151628aed2a6abf7158809cf4f3c")
-    iv = hex_to_bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff")
-    input = hex_to_bin("6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e51")
-    should_encrypt_as = hex_to_bin("874d6191b620e3261bef6864990db6ce9806f66b7970fdff8617187bb9fffdff")
-    
-    cipher = PolarSSL::Cipher.new("AES-128-CTR")
-    cipher.setkey(key, 128, PolarSSL::Cipher::OPERATION_ENCRYPT)
-    cipher.reset(iv)
-    cipher.update(input)
+    iv = SecureRandom.random_bytes(16)
+
+    cipher = PolarSSL::Cipher.new CIPHER
+    cipher.setkey KEY, 128, PolarSSL::Cipher::OPERATION_ENCRYPT
+    cipher.set_iv(iv, 16)
+    cipher.update(VALUE)
     encrypted = cipher.finish
 
-    assert_equal should_encrypt_as, encrypted    
-  end
-  
-  def test_aes_128_ctr_decrypt
-    key = hex_to_bin("2b7e151628aed2a6abf7158809cf4f3c")
-    iv = hex_to_bin("f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff")
-    input = hex_to_bin("874d6191b620e3261bef6864990db6ce")
-    should_decrypt_as = hex_to_bin("6bc1bee22e409f96e93d7e117393172a")
-    
-    cipher = PolarSSL::Cipher.new("AES-128-CTR")
-    cipher.setkey(key, 128, PolarSSL::Cipher::OPERATION_ENCRYPT)
-    cipher.reset(iv)
-    cipher.update(input)
+    cipher = PolarSSL::Cipher.new CIPHER
+    cipher.setkey KEY, 128, PolarSSL::Cipher::OPERATION_DECRYPT
+    cipher.set_iv(iv, 16)
+    cipher.update(encrypted)
     decrypted = cipher.finish
-    
-    assert_equal should_decrypt_as, decrypted
+
+    assert_equal VALUE, decrypted
   end
 
   def test_unsupported_cipher
-
     assert_raises PolarSSL::Cipher::UnsupportedCipher do
       PolarSSL::Cipher.new("meh")
     end
-
   end
-  
-  def test_initialization_vector_not_a_string
-    cipher = PolarSSL::Cipher.new("AES-128-CTR")
-    
-    assert_raises TypeError do
-      cipher.reset(nil)
-    end
-  end
 
   def test_unsupported_key
-
     assert_raises PolarSSL::Cipher::Error do
       cipher = PolarSSL::Cipher.new("AES-128-CTR")
       cipher.setkey("1234567890123456", 127, PolarSSL::Cipher::OPERATION_ENCRYPT)
     end
-
   end
-  
-  private
-  
-  def hex_to_bin(hex)
-    hex.scan(/../).map { |x| x.hex.chr }.join
-  end
-  
-  def bin_to_hex(data)
-    data.each_byte.map { |b| b.to_s(16).join }
-  end
-
-end
\ No newline at end of file
+end