openssl-ccm 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fc374df85e53e6b883aa37e73c3ef794663aa1a
-  data.tar.gz: c91598781b107b3ded956bd29c80ebf898434bad
+  metadata.gz: bcfb9a56cb2e5cc402ae3ffe01b433e389d8c578
+  data.tar.gz: 7ce23883a6eed6ef9ee941b4b2367522a69ebe67
 SHA512:
-  metadata.gz: 5421f2e254f941baf00785b8846781231dc66ac8cf6e5f02098fbed9734d5ab982dbfd69e9405c684b5eacda234232af1bdb6a2c140d38b884a749fb44087b25
-  data.tar.gz: 0256e2da4fc6da7f86663730d92643cbfbc8304c25ccd4996146eee0bd5d1184177a0a64a0b47c7dab640e31e2c2ed1c9b7196ffe7390a675279e94a4ffe5623
+  metadata.gz: 863821e84c474fbd9218a3d967b9a519165f7ff7b684536d6048ea1e2682f743936b7c925e6b4c7e2a73ebbf85d226ed7c7cd082692423240e304edd6f296443
+  data.tar.gz: 14a6aef3b2b91fb5faf309735d44731058fcfdd7bebed7872bd4da347fc30332e5d6a72b3ea772907412540a5bf3ba1d5b43ff676ac6b0be86b8346ad6d3cf17

data/Gemfile

@@ -4,4 +4,5 @@ gem 'rake', '>=10.2.2'
 gem 'rdoc', '>=4.1.1'
 gem 'yard', '>=0.8.7.3'
 gem 'rubocop', '>=0.18.1'
-gem 'coveralls', '>=00.7.0'
+gem 'test-unit', '>=3.1.4'
+gem 'coveralls', '>=0.7.0'

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/SmallLars/openssl-ccm.png?branch=master)](https://travis-ci.org/SmallLars/openssl-ccm)
 [![Coverage Status](https://coveralls.io/repos/SmallLars/openssl-ccm/badge.png?branch=master)](https://coveralls.io/r/SmallLars/openssl-ccm)
 [![Code Climate](https://codeclimate.com/github/SmallLars/openssl-ccm.png)](https://codeclimate.com/github/SmallLars/openssl-ccm)
-[![Inline docs](http://inch-pages.github.io/github/smalllars/openssl-ccm.png)](http://inch-pages.github.io/github/smalllars/openssl-ccm)
+[![Inline docs](http://inch-ci.org/github/smalllars/openssl-ccm.png)](http://inch-ci.org/github/smalllars/openssl-ccm)
 
 # openssl-ccm
 

data/lib/openssl/ccm/version.rb

@@ -1,5 +1,5 @@
 module OpenSSL
   class CCM
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
 end

data/lib/openssl/ccm.rb

@@ -21,7 +21,8 @@ module OpenSSL
     #
     # @return [[String]] supported algorithms
     def self.ciphers
-      l = OpenSSL::Cipher.ciphers.keep_if { |c| c.end_with?('-128-CBC') }
+      l = OpenSSL::Cipher.ciphers.keep_if { |c| c.end_with?('-128-CBC') or
+        c.end_with?('-192-CBC') or c.end_with?('-256-CBC') }
       l.length.times { |i| l[i] = l[i][0..-9] }
       l
     end
@@ -45,7 +46,15 @@ module OpenSSL
         fail CCMError, 'invalid mac length'
       end
 
-      @cipher = OpenSSL::Cipher.new("#{cipher}-128-CBC")
+      if key.length < 24
+        cipher_key_size = "128"
+      elsif key.length < 32
+        cipher_key_size = "192"
+      else
+        cipher_key_size = "256"
+      end
+
+      @cipher = OpenSSL::Cipher.new("#{cipher}-" + cipher_key_size  + "-CBC")
       @key = key
       @mac_len = mac_len
     end

data/test/test_ccm.rb

@@ -296,4 +296,44 @@ class CCMTest < Test::Unit::TestCase
       end
     end
   end
+
+  #Test case from https://github.com/weidai11/cryptopp/blob/master/TestVectors/ccm.txt
+  def test_aes_data_256
+    key =  %W(
+      0000000000000000000000000000000000000000000000000000000000000000
+      fb7615b23d80891dd470980bc79584c8b2fb64ce60978f4d17fce45a49e830b7
+    )
+
+    nonce = %W(
+      000000000000000000000000
+      dbd1a3636024b7b402da7d6f
+    )
+
+    plaintext = %W(
+      00000000000000000000000000000000
+      a845348ec8c5b5f126f50e76fefd1b1e
+    )
+
+    ciphertext = %W(
+      c1944044c8e7aa95d2de9513c7f3dd8c
+      cc881261c6a7fa72b96a1739176b277f
+    )
+
+    mac = %W(
+      4b0a3e5e51f151eb0ffae7c43d010fdb
+      3472e1145f2c0cbe146349062cf0e423
+    )
+
+    assert(OpenSSL::CCM.ciphers.include?('AES'), 'Missing AES-Cipher')
+    key.length.times do |i|
+      mac_len = mac[i].length / 2
+      ccm = OpenSSL::CCM.new('AES', [key[i]].pack('H*'), mac_len)
+      c = ccm.encrypt([plaintext[i]].pack('H*'), [nonce[i]].pack('H*'))
+      c_unpack = c.unpack('H*')
+      assert_equal([mac[i]], c[-mac_len..-1].unpack('H*'),
+                         "Wrong MAC ENCRYPT in Test #{i} ")
+      assert_equal([ciphertext[i]], c[0..-mac_len - 1].unpack('H*'),
+                         "Wrong ciphertext ENCRYPT in Test #{i}")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openssl-ccm
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Lars Schmertmann
@@ -90,6 +90,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -165,25 +185,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: RFC 3610 - CCM
 test_files:
 - test/test_ccm.rb
-- test/data_1-3_e
-- test/data_1-1_e
-- test/data_3
-- test/data_3-4_e
-- test/data_3-2_e
-- test/data_2-2_e
-- test/data_1-2_e
 - test/data_1-4_e
 - test/data_3-1_e
-- test/data_3-3_e
-- test/data_1
+- test/data_3-2_e
+- test/data_1-2_e
+- test/data_1-1_e
+- test/data_2-2_e
+- test/data_3-4_e
 - test/data_2
+- test/data_1
+- test/data_3
 - test/data_2-4_e
-- test/data_2-1_e
+- test/data_3-3_e
+- test/data_1-3_e
 - test/data_2-3_e
+- test/data_2-1_e
 has_rdoc: