blackbox 3.3.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd439770497c284d17c5af5d41c66cb0cda688fc
-  data.tar.gz: 5a3324a00ff18c50f0fddbb8257cd9b5a476e8f8
+  metadata.gz: b3aeb32000fc9cea63d18215bc7f87c550cfa382
+  data.tar.gz: 2e0bfcaefc68dbba17d672754cf565e51fcbb05b
 SHA512:
-  metadata.gz: 6dcfb05a55de1517900443519733259021b5cfc557e566606a7558ebc63cd92abfdb13b1ef8c792db6cb64c3756693da1c3261e15bdabcd779e79e5f2f521d8e
-  data.tar.gz: 8c4effdcc89b47fec5d38f22a155ed84777cfee55d827501b61cbdfcb1635df5a76e08193115087452b6a28645fb9a98fcc2898c5a3b3fb43db3bb84aa3be9d6
+  metadata.gz: 1856230d97fb5745cddc3b471022913c81ac20643fe083bd0a34199ee32fc80fb583c428967851b1252383e919b06e8fe88e30b1745378c7e6a56435f69527ec
+  data.tar.gz: b9e9a6d21021a558d83fbced43074804c279d7acff918d6b2bfedc5a6555e1233f9432d43115676b58a6276e242f67f7d159db726b1a97e907500b215f4640f5

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.4.0

data/Rakefile

@@ -11,9 +11,9 @@ RSpec::Core::RakeTask.new('test:spec') do |t|
 
   extra_opts = []
   extra_opts << if e.nil? && f.nil?
-                  '-f progress'
+                  '-f progress --fail-fast'
                 else
-                  '--color --fail-fast -f documentation'
+                  '--color -f documentation'
                 end
 
   extra_opts << " -e #{e}" unless e.nil?

data/blackbox.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
-  gem.required_ruby_version = '>= 2.3.0'
+  gem.required_ruby_version = '>= 2.4.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/coverage/.resultset.json

@@ -24,11 +24,11 @@
         702,
         702,
         700,
-        331,
-        331,
+        430,
+        430,
         null,
-        369,
-        369,
+        270,
+        270,
         null,
         null,
         null,
@@ -44,10 +44,10 @@
         372,
         372,
         372,
-        249,
-        249,
+        282,
+        282,
         null,
-        123,
+        90,
         null,
         372,
         null,
@@ -608,6 +608,6 @@
         null
       ]
     },
-    "timestamp": 1469891309
+    "timestamp": 1482682020
   }
 }

data/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.10.0/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2016-07-30T17:08:29+02:00">2016-07-30T17:08:29+02:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2016-12-25T17:07:00+01:00">2016-12-25T17:07:00+01:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">
@@ -25,7 +25,7 @@
      covered at
      <span class="covered_strength">
        <span class="green">
-         38.36
+         38.51
        </span>
     </span> hits/line)
   </h2>
@@ -57,7 +57,7 @@
         <td>48</td>
         <td>48</td>
         <td>0</td>
-        <td>156.1</td>
+        <td>156.8</td>
       </tr>
       
       <tr>
@@ -119,7 +119,7 @@
       </div>
     
       <div id="footer">
-        Generated by <a href="http://github.com/colszowka/simplecov">simplecov</a> v0.11.2 
+        Generated by <a href="http://github.com/colszowka/simplecov">simplecov</a> v0.12.0 
         and simplecov-html v0.10.0<br/>
         using RSpec
       </div>
@@ -251,7 +251,7 @@
         <li class="covered" data-hits="702" data-linenumber="19">
           <span class="hits">702</span>
           
-          <code class="ruby">        cipher = OpenSSL::Cipher::Cipher.new(cipher_type)</code>
+          <code class="ruby">        cipher = OpenSSL::Cipher.new(cipher_type)</code>
         </li>
       
         <li class="covered" data-hits="702" data-linenumber="20">
@@ -272,14 +272,14 @@
           <code class="ruby">        if iv.nil?</code>
         </li>
       
-        <li class="covered" data-hits="331" data-linenumber="23">
-          <span class="hits">331</span>
+        <li class="covered" data-hits="430" data-linenumber="23">
+          <span class="hits">430</span>
           
           <code class="ruby">          iv = cipher.random_iv</code>
         </li>
       
-        <li class="covered" data-hits="331" data-linenumber="24">
-          <span class="hits">331</span>
+        <li class="covered" data-hits="430" data-linenumber="24">
+          <span class="hits">430</span>
           
           <code class="ruby">          [iv.length].pack(&#39;C&#39;) + iv + cipher.update(plaintext) + cipher.final</code>
         </li>
@@ -290,14 +290,14 @@
           <code class="ruby">        else</code>
         </li>
       
-        <li class="covered" data-hits="369" data-linenumber="26">
-          <span class="hits">369</span>
+        <li class="covered" data-hits="270" data-linenumber="26">
+          <span class="hits">270</span>
           
           <code class="ruby">          cipher.iv = iv</code>
         </li>
       
-        <li class="covered" data-hits="369" data-linenumber="27">
-          <span class="hits">369</span>
+        <li class="covered" data-hits="270" data-linenumber="27">
+          <span class="hits">270</span>
           
           <code class="ruby">          cipher.update(plaintext) + cipher.final</code>
         </li>
@@ -371,7 +371,7 @@
         <li class="covered" data-hits="372" data-linenumber="39">
           <span class="hits">372</span>
           
-          <code class="ruby">        cipher = OpenSSL::Cipher::Cipher.new(cipher_type)</code>
+          <code class="ruby">        cipher = OpenSSL::Cipher.new(cipher_type)</code>
         </li>
       
         <li class="covered" data-hits="372" data-linenumber="40">
@@ -392,14 +392,14 @@
           <code class="ruby">        if iv.nil?</code>
         </li>
       
-        <li class="covered" data-hits="249" data-linenumber="43">
-          <span class="hits">249</span>
+        <li class="covered" data-hits="282" data-linenumber="43">
+          <span class="hits">282</span>
           
           <code class="ruby">          iv_len = ciphertext.slice!(0).unpack(&#39;C&#39;)[0]</code>
         </li>
       
-        <li class="covered" data-hits="249" data-linenumber="44">
-          <span class="hits">249</span>
+        <li class="covered" data-hits="282" data-linenumber="44">
+          <span class="hits">282</span>
           
           <code class="ruby">          cipher.iv = ciphertext.slice!(0..iv_len - 1) unless 0 == iv_len</code>
         </li>
@@ -410,8 +410,8 @@
           <code class="ruby">        else</code>
         </li>
       
-        <li class="covered" data-hits="123" data-linenumber="46">
-          <span class="hits">123</span>
+        <li class="covered" data-hits="90" data-linenumber="46">
+          <span class="hits">90</span>
           
           <code class="ruby">          cipher.iv = iv</code>
         </li>

data/doc/BB.html

@@ -115,7 +115,7 @@
         <dt id="VERSION-constant" class="">VERSION =
           
         </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>3.3.0</span><span class='tstring_end'>&#39;</span></span></pre></dd>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>4.0.0</span><span class='tstring_end'>&#39;</span></span></pre></dd>
       
     </dl>
   
@@ -131,9 +131,9 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:30 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/BB/Crypto.html

@@ -406,7 +406,7 @@
       <pre class="code"><span class="info file"># File 'lib/blackbox/crypto.rb', line 38</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_decrypt'>decrypt</span><span class='lparen'>(</span><span class='id identifier rubyid_ciphertext'>ciphertext</span><span class='comma'>,</span> <span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_cipher_type'>cipher_type</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>aes-256-cbc</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span> <span class='id identifier rubyid_iv'>iv</span> <span class='op'>=</span> <span class='kw'>nil</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_cipher'>cipher</span> <span class='op'>=</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>Cipher</span><span class='op'>::</span><span class='const'>Cipher</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_cipher_type'>cipher_type</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_cipher'>cipher</span> <span class='op'>=</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>Cipher</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_cipher_type'>cipher_type</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_cipher'>cipher</span><span class='period'>.</span><span class='id identifier rubyid_decrypt'>decrypt</span>
   <span class='id identifier rubyid_cipher'>cipher</span><span class='period'>.</span><span class='id identifier rubyid_key'>key</span> <span class='op'>=</span> <span class='id identifier rubyid_key'>key</span>
   <span class='kw'>if</span> <span class='id identifier rubyid_iv'>iv</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
@@ -831,7 +831,7 @@
       <pre class="code"><span class="info file"># File 'lib/blackbox/crypto.rb', line 18</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_encrypt'>encrypt</span><span class='lparen'>(</span><span class='id identifier rubyid_plaintext'>plaintext</span><span class='comma'>,</span> <span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_cipher_type'>cipher_type</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>aes-256-cbc</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span> <span class='id identifier rubyid_iv'>iv</span> <span class='op'>=</span> <span class='kw'>nil</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_cipher'>cipher</span> <span class='op'>=</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>Cipher</span><span class='op'>::</span><span class='const'>Cipher</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_cipher_type'>cipher_type</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_cipher'>cipher</span> <span class='op'>=</span> <span class='const'>OpenSSL</span><span class='op'>::</span><span class='const'>Cipher</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_cipher_type'>cipher_type</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_cipher'>cipher</span><span class='period'>.</span><span class='id identifier rubyid_encrypt'>encrypt</span>
   <span class='id identifier rubyid_cipher'>cipher</span><span class='period'>.</span><span class='id identifier rubyid_key'>key</span> <span class='op'>=</span> <span class='id identifier rubyid_key'>key</span>
   <span class='kw'>if</span> <span class='id identifier rubyid_iv'>iv</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
@@ -1142,9 +1142,9 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:31 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/BB/Crypto/ControlToken.html

@@ -520,9 +520,9 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:31 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/BB/Gem.html

@@ -428,9 +428,9 @@ version?</p>
 </div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:31 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/BB/Hash.html

@@ -432,9 +432,9 @@ BB::Hash.flatten_prop_style(input)
 </div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:31 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/BB/Number.html

@@ -920,9 +920,9 @@ can customize the format in the <code>options</code> hash.</p>
 </div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:31 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/BB/String.html

@@ -231,9 +231,9 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:31 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/BB/Unix.html

@@ -411,9 +411,9 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:31 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/_index.html

@@ -198,9 +198,9 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:30 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/file.README.html

@@ -95,9 +95,9 @@ BB::String.strip_ansi( ... )
 </div></div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:30 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/index.html

@@ -95,9 +95,9 @@ BB::String.strip_ansi( ... )
 </div></div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:30 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/doc/top-level-namespace.html

@@ -103,9 +103,9 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Jul 30 17:08:30 2016 by
+  Generated on Sun Dec 25 17:07:01 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.6 (ruby-2.3.1).
+  0.8.7.6 (ruby-2.4.0).
 </div>
 
   </body>

data/lib/blackbox/crypto.rb

@@ -16,7 +16,7 @@ module BB
       # @return [String] When iv == nil: iv_length+iv+ciphertext
       # @return [String] When iv != nil: ciphertext
       def encrypt(plaintext, key, cipher_type = 'aes-256-cbc', iv = nil)
-        cipher = OpenSSL::Cipher::Cipher.new(cipher_type)
+        cipher = OpenSSL::Cipher.new(cipher_type)
         cipher.encrypt
         cipher.key = key
         if iv.nil?
@@ -36,7 +36,7 @@ module BB
       # @param [String] iv Initialization vector
       # @return [String] Plaintext
       def decrypt(ciphertext, key, cipher_type = 'aes-256-cbc', iv = nil)
-        cipher = OpenSSL::Cipher::Cipher.new(cipher_type)
+        cipher = OpenSSL::Cipher.new(cipher_type)
         cipher.decrypt
         cipher.key = key
         if iv.nil?

data/lib/blackbox/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module BB
-  VERSION = '3.3.0'
+  VERSION = '4.0.0'
 end

data/spec/crypto_spec.rb

@@ -13,6 +13,50 @@ OPENSSL_CIPHERS = %w(aes-128-cbc aes-128-ecb aes-192-cbc aes-192-ecb aes-256-cbc
                   %w(rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb) +
                   %w(rc4 rc4-40)
 
+CIPHER_KEY_IV_SIZE = {
+  'aes-128-cbc': [16, 16],
+  'aes-128-ecb': [16, 1],
+  'aes-192-cbc': [24, 16],
+  'aes-192-ecb': [24, 1],
+  'aes-256-cbc': [32, 16],
+  'aes-256-ecb': [32, 1],
+  'bf': [16, 8],
+  'bf-cbc': [16, 8],
+  'bf-cfb': [16, 8],
+  'bf-ecb': [16, 1],
+  'bf-ofb': [16, 8],
+  'cast': [16, 8],
+  'cast-cbc': [16, 8],
+  'cast5-cbc': [16, 8],
+  'cast5-cfb': [16, 8],
+  'cast5-ecb': [16, 1],
+  'cast5-ofb': [16, 8],
+  'des': [8, 8],
+  'des-cbc': [8, 8],
+  'des-cfb': [8, 8],
+  'des-ecb': [8, 1],
+  'des-ede': [16, 1],
+  'des-ede-cbc': [16, 8],
+  'des-ede-cfb': [16, 8],
+  'des-ede-ofb': [16, 8],
+  'des-ede3': [24, 1],
+  'des-ede3-cbc': [24, 8],
+  'des-ede3-cfb': [24, 8],
+  'des-ede3-ofb': [24, 8],
+  'des-ofb': [8, 8],
+  'des3': [24, 8],
+  'desx': [24, 8],
+  'rc2': [16, 8],
+  'rc2-40-cbc': [5, 8],
+  'rc2-64-cbc': [8, 8],
+  'rc2-cbc': [16, 8],
+  'rc2-cfb': [16, 8],
+  'rc2-ecb': [16, 1],
+  'rc2-ofb': [16, 8],
+  'rc4': [16, 1],
+  'rc4-40': [5, 1]
+}.freeze
+
 TEST_KEY = '12345678901234567890123456789012'
 TEST_IV = 'x234567890123456789012345678901x'
 TEST_TEXT_SHORT = '[SHORT_TEST]' * 16
@@ -27,26 +71,34 @@ describe BB::Crypto do
         m_enc, m_dec = e
         describe "#{m_enc}, #{m_dec}" do
           it 'can decrypt what it encrypted (short string, random iv)' do
-            ct = BB::Crypto.send(m_enc, TEST_TEXT_SHORT, TEST_KEY, cipher)
-            pt = BB::Crypto.send(m_dec, ct, TEST_KEY, cipher)
+            test_key = TEST_KEY[0..CIPHER_KEY_IV_SIZE.fetch(cipher.to_sym)[0] - 1]
+            ct = BB::Crypto.send(m_enc, TEST_TEXT_SHORT, test_key, cipher)
+            pt = BB::Crypto.send(m_dec, ct, test_key, cipher)
             expect(pt).to eq(TEST_TEXT_SHORT)
           end
 
           it 'can decrypt what it encrypted (long string, random iv)' do
-            ct = BB::Crypto.send(m_enc, TEST_TEXT_LONG, TEST_KEY, cipher)
-            pt = BB::Crypto.send(m_dec, ct, TEST_KEY, cipher)
+            test_key = TEST_KEY[0..CIPHER_KEY_IV_SIZE.fetch(cipher.to_sym)[0] - 1]
+            ct = BB::Crypto.send(m_enc, TEST_TEXT_LONG, test_key, cipher)
+            pt = BB::Crypto.send(m_dec, ct, test_key, cipher)
             expect(pt).to eq(TEST_TEXT_LONG)
           end
 
           it 'can decrypt what it encrypted (long string, static iv)' do
-            ct = BB::Crypto.send(m_enc, TEST_TEXT_LONG, TEST_KEY, cipher, TEST_IV)
-            pt = BB::Crypto.send(m_dec, ct, TEST_KEY, cipher, TEST_IV)
+            test_key = TEST_KEY[0..CIPHER_KEY_IV_SIZE.fetch(cipher.to_sym)[0] - 1]
+            test_iv = TEST_IV[0..CIPHER_KEY_IV_SIZE.fetch(cipher.to_sym)[1] - 1]
+            test_iv = nil if test_iv.length == 1
+            ct = BB::Crypto.send(m_enc, TEST_TEXT_LONG, test_key, cipher, test_iv)
+            pt = BB::Crypto.send(m_dec, ct, test_key, cipher, test_iv)
             expect(pt).to eq(TEST_TEXT_LONG)
           end
 
           it 'returns consistent output with static iv' do
-            a = BB::Crypto.send(m_enc, TEST_TEXT_SHORT, TEST_KEY, cipher, TEST_IV)
-            b = BB::Crypto.send(m_enc, TEST_TEXT_SHORT, TEST_KEY, cipher, TEST_IV)
+            test_key = TEST_KEY[0..CIPHER_KEY_IV_SIZE.fetch(cipher.to_sym)[0] - 1]
+            test_iv = TEST_IV[0..CIPHER_KEY_IV_SIZE.fetch(cipher.to_sym)[1] - 1]
+            test_iv = nil if test_iv.length == 1
+            a = BB::Crypto.send(m_enc, TEST_TEXT_SHORT, test_key, cipher, test_iv)
+            b = BB::Crypto.send(m_enc, TEST_TEXT_SHORT, test_key, cipher, test_iv)
             expect(a).to eq(b)
           end
         end
@@ -69,7 +121,7 @@ describe BB::Crypto do
   end
 
   describe BB::Crypto::ControlToken do
-    TEST_KEY = '12345678901234567890123456789012'
+    test_key = '12345678901234567890123456789012'
     it "raises an Exception when no key is given and ENV['CONTROLTOKEN_SECRET'] is blank" do
       expect do
         subject.class.create('foo', [])
@@ -79,18 +131,18 @@ describe BB::Crypto do
     it 'raises an Exception when key is too short (via parameter)' do
       expect do
         subject.class.create('foo', [], 911, 'key')
-      end.to raise_error(OpenSSL::Cipher::CipherError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'raises an Exception when key is too short (via ENV)' do
       expect do
         ENV['CONTROLTOKEN_SECRET'] = 'x'
         subject.class.create('foo', [], 911)
-      end.to raise_error(OpenSSL::Cipher::CipherError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'decodes all elements of token payload as Strings' do
-      v = subject.class.parse(subject.class.create('foo', ['a', 2, :c], 5, TEST_KEY), TEST_KEY)
+      v = subject.class.parse(subject.class.create('foo', ['a', 2, :c], 5, test_key), test_key)
       expect(v[:op]).to eq('foo')
       expect(v[:args]).to eq(%w(a 2 c))
       expect(v[:expired]).to eq(false)
@@ -98,12 +150,12 @@ describe BB::Crypto do
 
     it 'raises an Exception when parsing expired Token with force=false' do
       expect do
-        subject.class.parse(subject.class.create('foo', ['a', 2, :c], -1, TEST_KEY), TEST_KEY)
+        subject.class.parse(subject.class.create('foo', ['a', 2, :c], -1, test_key), test_key)
       end.to raise_error(ArgumentError)
     end
 
     it 'returns token with expired=true when parsing expired Token with force=true' do
-      v = subject.class.parse(subject.class.create('foo', ['a', 2, :c], -1, TEST_KEY), TEST_KEY, true)
+      v = subject.class.parse(subject.class.create('foo', ['a', 2, :c], -1, test_key), test_key, true)
       expect(v[:expired]).to eq(true)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blackbox
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Moe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2016-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -358,7 +358,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -366,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Various little helpers