xmlenc 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ad3763ea55708060757d9024fcefd94616376ce
-  data.tar.gz: 8349e784ef7fd73c5a8da5ccfc26f1f5d370b42c
+SHA256:
+  metadata.gz: 189069caca22405d127c3d7814b26a34203962b33537d39684d7bcf54bec40cd
+  data.tar.gz: b3d3b202f281123001ded9d4a01e210fdfa4d70408a693e73d1d6017f7164df2
 SHA512:
-  metadata.gz: 8f234a88d0712b2eab9c3527ff0a7e098c1fa3d6313147624bfdd02e2a25f6f9d74f515cfdadb5d4dc137bb2673e10412d6018b125be1cdc03a4cde8a32d861b
-  data.tar.gz: 1e0048cfb4b07b267acd259db2ac64ecde2ba8c40f31a4426dbc864f2513af6524c67425c2c6703402309d2dbcbde387cb95b77967fe9017d5c8b7d073ad4477
+  metadata.gz: e0e2f5fed7fe6be20f00b009d8346f76dddfdf72ed042adc328bd0b5dfbd81b77651eecc82e4201086b18f0c5c96db73df75855bac4ed7ddc2aeb8345bea90c2
+  data.tar.gz: 533f7b9c88eba4686ea805b7aadfa1f2a02a745e0dd1926e9d6e5459f8163bacb6ed5b3ae56f1372bbb041ecc00b21bc74a4807403abeddf42e23f64ef91ed7d

data/.travis.yml

@@ -1,11 +1,10 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - jruby-19mode
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
+  - 2.0.0
+  - 2.1.10
+  - 2.2.10
+  - 2.5.9
+  - 2.6.8
+  - 2.7.4
+  - 3.0.2
 sudo: false

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# CHANGELOG
+
+## v0.8.0 - 2021-08-23
+* Add support for [AES-GCM encryption methods](https://github.com/digidentity/xmlenc/pull/30) - thanks [@cosine](https://github.com/cosine)
+* Remove travis support for ruby 1.9

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/digidentity/xmlenc.svg)](https://travis-ci.org/digidentity/xmlenc)
+[![Build Status](https://app.travis-ci.com/digidentity/xmlenc.svg?branch=master)](https://app.travis-ci.com/digidentity/xmlenc)
 [![Coverage Status](https://coveralls.io/repos/digidentity/xmlenc/badge.svg?branch=master&service=github)](https://coveralls.io/github/digidentity/xmlenc?branch=master)
 [![Code Climate](https://codeclimate.com/github/digidentity/xmlenc/badges/gpa.svg)](https://codeclimate.com/github/digidentity/xmlenc)
 
@@ -39,6 +39,9 @@ Data algorithms
 * http://www.w3.org/2001/04/xmlenc#tripledes-cbc
 * http://www.w3.org/2001/04/xmlenc#aes128-cbc
 * http://www.w3.org/2001/04/xmlenc#aes256-cbc
+* http://www.w3.org/2009/xmlenc11#aes128-gcm
+* http://www.w3.org/2009/xmlenc11#aes192-gcm
+* http://www.w3.org/2009/xmlenc11#aes256-gcm
 
 Key algorithms
 

data/Rakefile

@@ -25,8 +25,8 @@ require "rake/testtask"
 
 require "rspec/core/rake_task"
 
-# RSpec::Core::RakeTask.new(:core) do |spec|
-  # spec.rspec_opts = ['--backtrace']
-# end
+RSpec::Core::RakeTask.new(:core) do |spec|
+  spec.rspec_opts = ['--backtrace']
+end
 
 task :default => [:core]

data/lib/xmlenc.rb

@@ -38,6 +38,7 @@ module Xmlenc
     autoload :RsaOaepMgf1p, 'xmlenc/algorithms/rsa_oaep_mgf1p'
     autoload :DES3CBC, 'xmlenc/algorithms/des3_cbc'
     autoload :AESCBC, 'xmlenc/algorithms/aes_cbc'
+    autoload :AESGCM, 'xmlenc/algorithms/aes_gcm'
   end
 
   autoload :EncryptedDocument, 'xmlenc/encrypted_document'

data/lib/xmlenc/algorithms/aes_gcm.rb

@@ -0,0 +1,59 @@
+module Xmlenc
+  module Algorithms
+    class AESGCM
+      AUTH_TAG_LEN = 16
+
+      class << self
+        def [](size)
+          new(size)
+        end
+      end
+
+      def initialize(size)
+        @size = size
+      end
+
+      def setup(key = nil)
+        @cipher= nil
+        @iv    = nil
+        @key   = key || cipher.random_key
+        self
+      end
+
+      def decrypt(cipher_value, options = {})
+        cipher.decrypt
+        cipher.padding  = 0
+        cipher.key      = @key
+        cipher.iv       = cipher_value[0...iv_len]
+        cipher.auth_tag = cipher_value[-AUTH_TAG_LEN..-1]
+        cipher.update(cipher_value[iv_len..-(AUTH_TAG_LEN + 1)]) << cipher.final
+      end
+
+      def encrypt(data, options = {})
+        cipher.encrypt
+        cipher.key       = @key
+        cipher.iv        = iv
+        cipher.auth_data = ''
+        iv << (cipher.update(data) << cipher.final) << cipher.auth_tag
+      end
+
+      def key
+        @key
+      end
+
+      private
+
+      def iv
+        @iv ||= cipher.random_iv
+      end
+
+      def iv_len
+        cipher.iv_len
+      end
+
+      def cipher
+        @cipher ||= OpenSSL::Cipher.new("aes-#{@size}-gcm")
+      end
+    end
+  end
+end

data/lib/xmlenc/builder/base.rb

@@ -31,7 +31,7 @@ module Xmlenc
 
       module XmlMapperClassMethods
         def parse(xml, options = {})
-          raise Xmlenc::UnparseableMessage("Unable to parse nil document") if xml.nil?
+          raise Xmlenc::UnparseableMessage.new("Unable to parse nil document") if xml.nil?
 
           object = super
           if object.is_a?(Array)

data/lib/xmlenc/builder/encrypted_data.rb

@@ -6,7 +6,10 @@ module Xmlenc
       ALGORITHMS = {
           'http://www.w3.org/2001/04/xmlenc#tripledes-cbc' => Algorithms::DES3CBC,
           'http://www.w3.org/2001/04/xmlenc#aes128-cbc'    => Algorithms::AESCBC[128],
-          'http://www.w3.org/2001/04/xmlenc#aes256-cbc'    => Algorithms::AESCBC[256]
+          'http://www.w3.org/2001/04/xmlenc#aes256-cbc'    => Algorithms::AESCBC[256],
+          'http://www.w3.org/2009/xmlenc11#aes128-gcm'     => Algorithms::AESGCM[128],
+          'http://www.w3.org/2009/xmlenc11#aes192-gcm'     => Algorithms::AESGCM[192],
+          'http://www.w3.org/2009/xmlenc11#aes256-gcm'     => Algorithms::AESGCM[256]
       }
       TYPES = {
           'http://www.w3.org/2001/04/xmlenc#Element' => :element,

data/lib/xmlenc/encrypted_data.rb

@@ -3,7 +3,10 @@ module Xmlenc
     ALGORITHMS = {
         'http://www.w3.org/2001/04/xmlenc#tripledes-cbc' => Algorithms::DES3CBC,
         'http://www.w3.org/2001/04/xmlenc#aes128-cbc'    => Algorithms::AESCBC[128],
-        'http://www.w3.org/2001/04/xmlenc#aes256-cbc'    => Algorithms::AESCBC[256]
+        'http://www.w3.org/2001/04/xmlenc#aes256-cbc'    => Algorithms::AESCBC[256],
+        'http://www.w3.org/2009/xmlenc11#aes128-gcm'     => Algorithms::AESGCM[128],
+        'http://www.w3.org/2009/xmlenc11#aes192-gcm'     => Algorithms::AESGCM[192],
+        'http://www.w3.org/2009/xmlenc11#aes256-gcm'     => Algorithms::AESGCM[256]
     }
 
     TYPES = {

data/lib/xmlenc/version.rb

@@ -1,3 +1,3 @@
 module Xmlenc
-  VERSION = "0.7.1"
+  VERSION = '0.8.0'.freeze
 end

data/spec/lib/xmlenc/algorithms/aes_gcm_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+
+describe Xmlenc::Algorithms::AESGCM do
+  let(:data) { "<CreditCard Currency=\"USD\" Limit=\"5,000\">\r\n    <Number>4019 2445 0277 5567</Number>\r\n    <Issuer>Bank of the Internet</Issuer>\r\n    <Expiration Time=\"04/02\"/>\r\n  </CreditCard>" }
+
+  describe 'aes128-gcm' do
+    let(:cipher_value) { Base64.decode64 "YjIkLPqklVVN1faEgndPFXgXaOlVVaL+5X8NCDkbgQsbv6D2Jo7d9NQCyMbp1MgU2myCUynzdXMKdVIaqTt14pkr+NtYD6kBFPUkTvbcMIc86L5aqoMIEeqeJCK3aYLNGcY05xxOpuHvMzh2tEoZPFLEd9WgsNGhfv+4GqKiXxMVrjeLp7Iz9dYB4XmfLnQr62m4vYsZpxzg0mkxX6miCDNplv4wVBSwMDCvAFbAoWltKd+upjwaPQDNLIp0GYfQdCr7cu6K0ep4sIc=" }
+    let(:key) { %w(1e8c108fc0521dcad99ff2daad45af64).pack('H*') }
+    let(:iv) { %w(6232242cfaa495554dd5f684).pack('H*') }
+    subject { described_class.new(128).setup(key) }
+
+    describe 'encrypt' do
+      it 'encrypts the data' do
+        allow(subject).to receive(:iv).and_return(iv)
+        expect(subject.encrypt(data)).to be == cipher_value
+      end
+    end
+
+    describe 'decrypt' do
+      it 'decrypts the cipher_value' do
+        expect(subject.decrypt(cipher_value)).to be == data
+      end
+    end
+  end
+
+  describe 'aes192-gcm' do
+    let(:cipher_value) { Base64.decode64 "YjIkLPqklVVN1faETdI41CyJetO9+vdpho9swtvre7VRd5GpkFxp3lioUUlL2URCVx24YMHOzI6ksj0jQxASXn5uvNdIUrOxtTUzzUlIKk2Jbsi6uecP/YNz7NINxz4RqcjxiH+X8IF9etWAjRt+Z2zI/5YaUsQ/kPcrfesUxaH+6aMH9XWDXNqHdCjlxxMTw/4Sj9GqGmdC73CdokggeS8dfF05TZRF4lH2kTZ/RBgS7EEwwXZVKlq6yHfe5Jv2VxHqKJ8f/OSEyiw=" }
+    let(:key) { %w(68432eb84dcb27e6cf46cc8d2cb1659484bbea7d0a8131f4).pack('H*') }
+    let(:iv) { %w(6232242cfaa495554dd5f684).pack('H*') }
+    subject { described_class.new(192).setup(key) }
+
+    describe 'encrypt' do
+      it 'encrypts the data' do
+        allow(subject).to receive(:iv).and_return(iv)
+        expect(subject.encrypt(data)).to be == cipher_value
+      end
+    end
+
+    describe 'decrypt' do
+      it 'decrypts the cipher_value' do
+        expect(subject.decrypt(cipher_value)).to be == data
+      end
+    end
+  end
+
+  describe 'aes256-gcm' do
+    let(:cipher_value) { Base64.decode64 "YjIkLPqklVVN1faEcqScF7ALyB/fb+q3+HRW17n2rUqvdO8AmI4h7wXOwj5wgeP7KBCuR6IWQK9bUeZE+EoIR+tQNXmN8CofZ6s81QbZEPMiNdRnurXz0LNaSZUL1D1ivic62TYtfgqVX+z7wesGBviRM+vHcfRQlmN5sSzBtgPF9n5u2D6mpG9fa/+I33pAFDy2FeHI1CFPzLzbvKDqnjfM7zDd0YbsNi+5czoWl7likHNplPXR1jhLxOmKPWloKQVEG8f2KHsL/ZI=" }
+    let(:key) { %w(7b655b83e4821c9302d24be876b7783b2301b06b4ff89cabe8e9809d7602f207).pack('H*') }
+    let(:iv) { %w(6232242cfaa495554dd5f684).pack('H*') }
+    subject { described_class.new(256).setup(key) }
+
+    describe 'encrypt' do
+      it 'encrypts the data' do
+        allow(subject).to receive(:iv).and_return(iv)
+        expect(subject.encrypt(data)).to be == cipher_value
+      end
+    end
+
+    describe 'decrypt' do
+      it 'decrypts the cipher_value' do
+        expect(subject.decrypt(cipher_value)).to be == data
+      end
+    end
+  end
+end

data/spec/lib/xmlenc/builder/base_spec.rb

@@ -21,7 +21,7 @@ describe BaseDummy do
     it "raises an error if the message is nil" do
       expect {
         BaseDummy.parse(nil)
-      }.to raise_error(Xmlenc::UnparseableMessage)
+      }.to raise_error(Xmlenc::UnparseableMessage, 'Unable to parse nil document')
     end
   end
 end

data/xmlenc.gemspec

@@ -1,36 +1,28 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+$:.push File.expand_path('../lib', __FILE__)
 require 'xmlenc/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "xmlenc"
+  spec.name          = 'xmlenc'
   spec.version       = Xmlenc::VERSION
-  spec.authors       = ["Benoist"]
-  spec.email         = ["bclaassen@digidentity.eu"]
-  spec.description   = %q{A (partial)implementation of the XMLENC specificiation}
-  spec.summary       = %q{A (partial)implementation of the XMLENC specificiation}
-  spec.homepage      = "https://github.com/digidentity/xmlenc"
-  spec.license       = "MIT"
+  spec.authors       = ['Benoist']
+  spec.email         = ['bclaassen@digidentity.eu']
+  spec.description   = 'A (partial)implementation of the XMLENC specificiation'
+  spec.summary       = 'A (partial)implementation of the XMLENC specificiation'
+  spec.homepage      = 'https://github.com/digidentity/xmlenc'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  if RUBY_VERSION < '1.9'
-    spec.add_dependency "activesupport", "~> 3.0.0"
-    spec.add_dependency "activemodel", "~> 3.0.0"
-    spec.add_dependency "nokogiri", "~> 1.5.10"
-  else
-    spec.add_dependency "activesupport", ">= 3.0.0"
-    spec.add_dependency "activemodel", ">= 3.0.0"
-    spec.add_dependency "xmlmapper", '>= 0.7.3'
-    spec.add_runtime_dependency('nokogiri', '>= 1.6.0', '< 2.0.0')
-  end
+  spec.add_runtime_dependency 'activesupport', '>= 3.0.0'
+  spec.add_runtime_dependency 'activemodel', '>= 3.0.0'
+  spec.add_runtime_dependency 'xmlmapper', '>= 0.7.3'
+  spec.add_runtime_dependency 'nokogiri', '>= 1.6.0', '< 2.0.0'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rspec-rails", "~> 2.14"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rspec-rails', '>= 2.14'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'coveralls'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlenc
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Benoist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -76,28 +76,28 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
@@ -138,12 +138,14 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/xmlenc.rb
 - lib/xmlenc/algorithms/aes_cbc.rb
+- lib/xmlenc/algorithms/aes_gcm.rb
 - lib/xmlenc/algorithms/des3_cbc.rb
 - lib/xmlenc/algorithms/rsa_15.rb
 - lib/xmlenc/algorithms/rsa_oaep_mgf1p.rb
@@ -181,6 +183,7 @@ files:
 - spec/fixtures/template.xml
 - spec/fixtures/template2.xml
 - spec/lib/xmlenc/algorithms/aes_cbc_spec.rb
+- spec/lib/xmlenc/algorithms/aes_gcm_spec.rb
 - spec/lib/xmlenc/algorithms/des3_cbc_spec.rb
 - spec/lib/xmlenc/algorithms/rsa_15_spec.rb
 - spec/lib/xmlenc/algorithms/rsa_oaep_mgf1p_spec.rb
@@ -222,8 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A (partial)implementation of the XMLENC specificiation
@@ -247,6 +249,7 @@ test_files:
 - spec/fixtures/template.xml
 - spec/fixtures/template2.xml
 - spec/lib/xmlenc/algorithms/aes_cbc_spec.rb
+- spec/lib/xmlenc/algorithms/aes_gcm_spec.rb
 - spec/lib/xmlenc/algorithms/des3_cbc_spec.rb
 - spec/lib/xmlenc/algorithms/rsa_15_spec.rb
 - spec/lib/xmlenc/algorithms/rsa_oaep_mgf1p_spec.rb