openssl-cmac 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 63fc4231601c14a5a8a6fc04bdcc4291b7be2cda
-  data.tar.gz: cbcabe5e112d41adf149d6eac700157569731636
+SHA256:
+  metadata.gz: 58e850b8ce1e363d8f266ca946ed468f04a9161bd7eb971952aed8bbbe7f710e
+  data.tar.gz: f0e70e6e6aea806c6c84a79f7dc08dfc8cd943d25252e58b624151041eb2a829
 SHA512:
-  metadata.gz: 3d1d6128a6a4c99b71461f7d14411502215e19aa33779f38d907203d62333052000cd3aed8c4f1a1d3706bf0f554ea7ce70a2b44173145683e345343d92486ca
-  data.tar.gz: a86fc591bd98f5505986c1807d61a32214a9892366553268e3e3791c90865a6c339520a0d8929de1322030a1eca837643018af5655800e03ac79c8599dbbd483
+  metadata.gz: e9ad7b7a1d120025675cecd4f58839f295614bde15174a96581f055c064b418b33a40e54c99faa76776a2da93c1dee6765c2d8c21dbfe1463a85a1fcfd153fd6
+  data.tar.gz: 9769d44ea03d292b490a16cf352a47dd42fce4ff0fe87426bd0efa5ffd56c20cd1ef64282233328edaba7a0a0a9b180266763aa6c6d721e1e2078725b4c4fcda

data/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
-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 '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/README.md

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

data/Rakefile

@@ -24,7 +24,7 @@ task :clean do
 end
 
 desc "Development Dependencies"
-task (:devinst) { sh "gem install --dev ./openssl-cmac-#{OpenSSL::CMAC::VERSION}.gem" }
+task (:devinst) { sh "gem install --dev ./pkg/openssl-cmac-#{OpenSSL::CMAC::VERSION}.gem" }
 
 desc "Bundle install"
 task (:bundle) { sh "bundle install" }

data/lib/openssl/cmac.rb

@@ -26,9 +26,7 @@ module OpenSSL
     #
     # @return [[String]] supported algorithms
     def self.ciphers
-      l = OpenSSL::Cipher.ciphers.keep_if { |c| c.end_with?('-128-CBC') }
-      l.length.times { |i| l[i] = l[i][0..-9] }
-      l
+      @ciphers ||= OpenSSL::Cipher.ciphers.select { |c| c.match(/-128-CBC$/i) }.map { |e| e[0..-9].upcase }.uniq
     end
 
     # Returns the authentication code as a binary string. The cipher parameter
@@ -56,13 +54,13 @@ module OpenSSL
     #
     # @return [Object] the new CMAC object
     def initialize(cipher, key = '')
-      unless CMAC.ciphers.include?(cipher)
+      unless CMAC.ciphers.include?(cipher.upcase)
         fail CMACError, "unsupported cipher algorithm (#{cipher})"
       end
 
       @keys = []
       @buffer = ''.force_encoding('ASCII-8BIT')
-      @cipher = OpenSSL::Cipher.new("#{cipher}-128-CBC")
+      @cipher = OpenSSL::Cipher.new("#{cipher.upcase}-128-CBC")
 
       self.key = key unless key == ''
     end
@@ -83,7 +81,7 @@ module OpenSSL
       cipher = OpenSSL::Cipher.new(@cipher.name)
       cipher.encrypt
       cipher.key = @keys[0]
-      k = cipher.update("\x00" * 16).bytes
+      k = (cipher.update("\x00" * 16) + cipher.final).bytes[0...16]
       1.upto(2) do |i|
         k = k.pack('C*').unpack('B*')[0]
         msb = k.slice!(0)
@@ -127,7 +125,7 @@ module OpenSSL
     def reset
       @keys.clear
       @buffer.clear
-      @cipher.reset
+      @cipher.reset unless @keys[0].nil?
       @cipher.encrypt
       self
     end
@@ -158,11 +156,14 @@ module OpenSSL
       k = @keys[block.length == 16 ? 1 : 2].dup
       i = block.length.times { |t| k[t] ^= block[t] }
       k[i] ^= 0x80 if i < 16
-      mac = @cipher.update(k.pack('C*'))
+      mac = @cipher.update(k.pack('C*')) + @cipher.final
       @cipher.reset
       @cipher.encrypt
       @cipher.key = @keys[0]
-      mac[0...length]
+      # Each block is 16-bytes and the last block will always be PKCS#7 padding
+      # which we want to discard.  Take the last block prior to the padding for
+      # the MAC.
+      mac[-32...(-32 + length)]
     end
   end
 end

data/lib/openssl/cmac/version.rb

@@ -1,5 +1,5 @@
 module OpenSSL
   class CMAC
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/test/test_cmac.rb

@@ -87,39 +87,41 @@ class CMACTest < Test::Unit::TestCase
   end
 
   def test_cmac_update
-    # Test with 1 call of update and new CCM object for each test.
-    DATA.length.times do |i|
-      cmac = OpenSSL::CMAC.new('AES', KEY)
-      m = cmac.update(DATA[i]).digest.unpack('H*')[0]
-      assert_equal(MAC[i], m, "Test: 1, Vector: #{i + 1}")
-    end
+    for cipher in ['aes', 'AES']
+      # Test with 1 call of update and new CCM object for each test.
+      DATA.length.times do |i|
+        cmac = OpenSSL::CMAC.new(cipher, KEY)
+        m = cmac.update(DATA[i]).digest.unpack('H*')[0]
+        assert_equal(MAC[i], m, "Test: 1, Vector: #{i + 1}")
+      end
 
-    # Test with 1 call of update and same CCM object for each test.
-    # There is no reset, because it should be possible to calculate
-    # a new mac after digest without reset.
-    cmac = OpenSSL::CMAC.new('AES', KEY)
-    DATA.length.times do |i|
-      m = cmac.update(DATA[i]).digest.unpack('H*')[0]
-      assert_equal(MAC[i], m, "Test: 2, Vector: #{i + 1}")
-    end
+      # Test with 1 call of update and same CCM object for each test.
+      # There is no reset, because it should be possible to calculate
+      # a new mac after digest without reset.
+      cmac = OpenSSL::CMAC.new(cipher, KEY)
+      DATA.length.times do |i|
+        m = cmac.update(DATA[i]).digest.unpack('H*')[0]
+        assert_equal(MAC[i], m, "Test: 2, Vector: #{i + 1}")
+      end
 
-    # Test with multiple calls of update and new CCM object for each test
-    1.upto(DATA.length - 1) do |i|
-      1.upto(17) do |c|
-        cmac = OpenSSL::CMAC.new('AES', KEY)
-        DATA[i].bytes.each_slice(c) { |w| cmac.update(w.pack('C*')) }
-        m = cmac.digest.unpack('H*')[0]
-        assert_equal(MAC[i], m, "Test: 3, Vector: #{i + 1}, Tokenlen: #{c}")
+      # Test with multiple calls of update and new CCM object for each test
+      1.upto(DATA.length - 1) do |i|
+        1.upto(17) do |c|
+          cmac = OpenSSL::CMAC.new(cipher, KEY)
+          DATA[i].bytes.each_slice(c) { |w| cmac.update(w.pack('C*')) }
+          m = cmac.digest.unpack('H*')[0]
+          assert_equal(MAC[i], m, "Test: 3, Vector: #{i + 1}, Tokenlen: #{c}")
+        end
       end
-    end
 
-    # Test with multiple calls of update and same CCM object for each test
-    cmac = OpenSSL::CMAC.new('AES', KEY)
-    1.upto(DATA.length - 1) do |i|
-      1.upto(17) do |c|
-        DATA[i].bytes.each_slice(c) { |w| cmac.update(w.pack('C*')) }
-        m = cmac.digest.unpack('H*')[0]
-        assert_equal(MAC[i], m, "Test: 4, Vector: #{i + 1}, Tokenlen: #{c}")
+      # Test with multiple calls of update and same CCM object for each test
+      cmac = OpenSSL::CMAC.new(cipher, KEY)
+      1.upto(DATA.length - 1) do |i|
+        1.upto(17) do |c|
+          DATA[i].bytes.each_slice(c) { |w| cmac.update(w.pack('C*')) }
+          m = cmac.digest.unpack('H*')[0]
+          assert_equal(MAC[i], m, "Test: 4, Vector: #{i + 1}, Tokenlen: #{c}")
+        end
       end
     end
 
@@ -130,25 +132,27 @@ class CMACTest < Test::Unit::TestCase
   end
 
   def test_cmac_digest
-    cmac = OpenSSL::CMAC.new('AES', KEY)
-    m = cmac.update(DATA[3]).digest.unpack('H*')[0]
-    assert_equal(MAC[3], m, 'Digest with no update')
-
-    cmac.update(DATA[3].b[0...20])
-    m = cmac.update(DATA[3].b[20...64]).digest.unpack('H*')[0]
-    assert_equal(MAC[3], m, 'Digest after update')
-
-    cmac.update(DATA[3])
-    m = cmac.update('').digest.unpack('H*')[0]
-    assert_equal(MAC[3], m, 'Empty digest')
-
-    DATA.length.times do |i|
-      m = OpenSSL::CMAC.digest('AES', KEY, DATA[i]).unpack('H*')[0]
-      assert_equal(MAC[i], m, "Vector: #{i + 1}")
-
-      m = OpenSSL::CMAC.digest('AES', KEY, DATA[i], 12).unpack('H*')[0]
-      assert_equal(24, m.length, "Vector: #{i + 1} - length")
-      assert_equal(MAC[i][0...24], m, "Vector: #{i + 1} - 12")
+    for cipher in ['aes', 'AES']
+      cmac = OpenSSL::CMAC.new(cipher, KEY)
+      m = cmac.update(DATA[3]).digest.unpack('H*')[0]
+      assert_equal(MAC[3], m, 'Digest with no update')
+
+      cmac.update(DATA[3].b[0...20])
+      m = cmac.update(DATA[3].b[20...64]).digest.unpack('H*')[0]
+      assert_equal(MAC[3], m, 'Digest after update')
+
+      cmac.update(DATA[3])
+      m = cmac.update('').digest.unpack('H*')[0]
+      assert_equal(MAC[3], m, 'Empty digest')
+
+      DATA.length.times do |i|
+        m = OpenSSL::CMAC.digest(cipher, KEY, DATA[i]).unpack('H*')[0]
+        assert_equal(MAC[i], m, "Vector: #{i + 1}")
+
+        m = OpenSSL::CMAC.digest(cipher, KEY, DATA[i], 12).unpack('H*')[0]
+        assert_equal(24, m.length, "Vector: #{i + 1} - length")
+        assert_equal(MAC[i][0...24], m, "Vector: #{i + 1} - 12")
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openssl-cmac
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Maxim M. Chechel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2019-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -17,100 +17,120 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.2.2
+        version: 12.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 10.2.2
+        version: 12.3.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 4.3.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
 - !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.3
+        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.3
+        version: 0.9.16
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.50.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.50'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.50.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.50'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 3.2.9
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.22
 description: Ruby Gem for RFC 4493, 4494, 4615 - The AES-CMAC Algorithm
 email:
 - maximchick@gmail.com
@@ -151,11 +171,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: RFC 4493, 4494, 4615 - CMAC
 test_files:
 - test/test_cmac.rb
-has_rdoc: