openssl-ccm 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b6f0af03a51c9201108d1ac8e3335fc67349b44c
-  data.tar.gz: 245686e9bcc444b25d34add352339b05dbe3c434
+SHA256:
+  metadata.gz: 94f0f2ac744cac26cf3f3fe5ec47b676d656d0a3d57eaef6ac5af2e5aceade69
+  data.tar.gz: 0c5e4bee394768df4c0d7f88edd4c297513e420c8bfb2dd10f4ddbe885fa552f
 SHA512:
-  metadata.gz: 14757372cb7d6b005da6a604d5c8e2a8c029f05e53314c68f20770eaaf37522570ff7e115741bc5f2ccb0c3334c1312746892718aba460ba4025cc6ba594b4cd
-  data.tar.gz: b4a17e4e98d8ffae82f625a478b4312421523254e8f5d7b08d4ce79a361276e8a71a796f241c42f3966adbf7d4111813e680f31cc3adc988a00e4fe2274ae85a
+  metadata.gz: 3ec73e24140d4702b6a5debd39d5ef77dd1815d9c5a9bccc586350474ddbe971f02727261deb1fe320596662847cd2598b08ac652ce8b42c279bbeceb67df5fb
+  data.tar.gz: f6e5f8c3a7380b21cab77f9ca1af26635c9564fc4f0b05df7b4b537bad6b96e9d4bb622efd796d9708d2dd1119891c7e6fb84bd6d423795fe41fa3b54ee9d24a

data/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-gem 'rake', '>=10.4.2'
-gem 'rdoc', '>=4.2.0'
-gem 'yard', '>=0.8.7.6'
-gem 'rubocop', '>=0.34.2'
-gem 'test-unit', '>=3.1.4'
-gem 'coveralls', '>=0.8.2'
+gem 'rake', '>=12.3.2'
+gem 'rdoc', '>=4.3.0'
+gem 'yard', '>=0.9.16'
+gem 'rubocop', '>=0.50.0'
+gem 'test-unit', '>=3.2.9'
+gem 'coveralls', '>=0.8.22'

data/lib/openssl/ccm.rb

@@ -21,10 +21,7 @@ module OpenSSL
     #
     # @return [[String]] supported algorithms
     def self.ciphers
-      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
+      @ciphers ||= OpenSSL::Cipher.ciphers.select { |c| c.match(/-(128|192|256)-CBC$/i) }.map { |e| e[0..-9].upcase }.uniq
     end
 
     public
@@ -38,7 +35,7 @@ module OpenSSL
     #
     # @return [Object] the new CCM object
     def initialize(cipher, key, mac_len)
-      unless CCM.ciphers.include?(cipher)
+      unless CCM.ciphers.include?(cipher.upcase)
         fail CCMError, "unsupported cipher algorithm (#{cipher})"
       end
       fail CCMError, 'invalid key length' unless key.b.length >= 16
@@ -54,7 +51,7 @@ module OpenSSL
         cipher_key_size = "256"
       end
 
-      @cipher = OpenSSL::Cipher.new("#{cipher}-" + cipher_key_size  + "-CBC")
+      @cipher = OpenSSL::Cipher.new("#{cipher.upcase}-" + cipher_key_size  + "-CBC")
       @key = key
       @mac_len = mac_len
     end

data/lib/openssl/ccm/version.rb

@@ -1,5 +1,5 @@
 module OpenSSL
   class CCM
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end

data/test/test_ccm.rb

@@ -281,16 +281,19 @@ class CCMTest < Test::Unit::TestCase
     mac_len = [16, 8, 14, 8]
 
     assert(OpenSSL::CCM.ciphers.include?('AES'), 'Missing AES-Cipher')
-    1.upto(3) do |i|
-      open("test/data_#{i}", mode = 'r') do |i_file|
-        input = i_file.read
-        key.length.times do |j|
-          open("test/data_#{i}-#{j + 1}_e", mode = 'r') do |o_file|
-            output = o_file.read
-            ccm = OpenSSL::CCM.new('AES', [key[j]].pack('H*'), mac_len[j])
-            c = ccm.encrypt(input, [nonce[j]].pack('H*'))
-            assert_equal(output.unpack('H*'), c.unpack('H*'),
-                         "Wrong ENCRYPT in Vector #{i + 1}")
+
+    for cipher in ['aes', 'AES']
+      1.upto(3) do |i|
+        open("test/data_#{i}", mode = 'r') do |i_file|
+          input = i_file.read
+          key.length.times do |j|
+            open("test/data_#{i}-#{j + 1}_e", mode = 'r') do |o_file|
+              output = o_file.read
+              ccm = OpenSSL::CCM.new(cipher, [key[j]].pack('H*'), mac_len[j])
+              c = ccm.encrypt(input, [nonce[j]].pack('H*'))
+              assert_equal(output.unpack('H*'), c.unpack('H*'),
+                           "Wrong ENCRYPT in Vector #{i + 1}")
+            end
           end
         end
       end
@@ -325,15 +328,17 @@ class CCMTest < Test::Unit::TestCase
     )
 
     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}")
+
+    for cipher in ['aes', 'AES']
+      key.length.times do |i|
+        mac_len = mac[i].length / 2
+        ccm = OpenSSL::CCM.new(cipher, [key[i]].pack('H*'), mac_len)
+        c = ccm.encrypt([plaintext[i]].pack('H*'), [nonce[i]].pack('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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openssl-ccm
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Lars Schmertmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,100 +16,100 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 12.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: 12.3.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7.6
+        version: 0.9.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7.6
+        version: 0.9.16
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.50'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.50'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.50.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.2.9
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
         version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.22
 description: Ruby Gem for RFC 3610 - Counter with CBC-MAC (CCM)
 email:
 - SmallLars@t-online.de
@@ -185,25 +185,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: RFC 3610 - CCM
 test_files:
 - test/test_ccm.rb
-- test/data_1-4_e
-- test/data_3-1_e
 - 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-1_e
 - test/data_3
+- test/data_1-2_e
 - test/data_2-4_e
-- test/data_3-3_e
+- test/data_1-4_e
 - test/data_1-3_e
+- test/data_2-2_e
 - test/data_2-3_e
+- test/data_1
+- test/data_2
+- test/data_1-1_e
 - test/data_2-1_e
-has_rdoc: 
+- test/data_3-3_e