xml-kit 0.1.14 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa2eb376d5c11a9777e3a3a6073754c9783c73bdc24bbb45c7ac5877e3e99472
-  data.tar.gz: 6eb275d2a3791889c12a04a5e2b1143807bf4e1ac1968491f93ef32faeccd868
+  metadata.gz: ee208a968c74fe0dc205e929d934b15bff996f417e9d6d7d466a42658f264ce6
+  data.tar.gz: 392da204421d6acd28ed5e123c5bdb02790fb74401ea6dfca68204c1050a0dcf
 SHA512:
-  metadata.gz: 0447e7510327c68ee2f9f500b980d1d36255b044a3825dfd504245ea111eb367f998a0bc6a507d54e5f64472de76a2766460085c808b8ca380254fdbe12feaa0
-  data.tar.gz: 7f9c69571ddd52a638daf3b20062cc4b2d06cfd7cd83f6a517405330daddc8c8bb8d62fbd054b02ad8ad1eda6a9229ef0221f97d90b4d4ee3318420175eb3405
+  metadata.gz: 9cbda7b1dcb0dfad250bd8de4b73d20eaeff7bd26884f700d0976967c5522626bb988205609e3e25ed1afd536b3d569d281e4456adcda2ebad4396647697b857
+  data.tar.gz: 56e952683e4376af240cef1933c112a17637cfaf7982ed29034212f203d516b0278fbbbf1c8423a550daf1e9972c197a2a1425f5ec7844202d1e0df96d1b448f

data/.rubocop.yml

@@ -1,5 +1,3 @@
-inherit_from: .rubocop_todo.yml
-
 require:
   - rubocop/cop/internal_affairs
   - rubocop-rspec
@@ -11,7 +9,7 @@ AllCops:
     - 'spec/fixtures/**/*'
     - 'tmp/**/*'
     - 'vendor/**/*'
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.5
 
 Layout/ClassStructure:
   Enabled: true
@@ -32,12 +30,15 @@ Layout/ClassStructure:
 Layout/EndOfLine:
   EnforcedStyle: lf
 
-Layout/IndentArray:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   EnforcedStyle: active_support
 
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/**/*.rb'
@@ -46,6 +47,10 @@ Lint/InterpolationCheck:
   Exclude:
     - 'spec/**/*.rb'
 
+Metrics/AbcSize:
+  Exclude:
+    - 'lib/xml/kit/self_signed_certificate.rb'
+
 Metrics/BlockLength:
   Exclude:
     - '**/**/*.builder'
@@ -59,8 +64,10 @@ Metrics/ModuleLength:
     - 'spec/**/*.rb'
 
 Metrics/LineLength:
+  IgnoredPatterns: ['(\A|\s)#']
   Exclude:
     - 'spec/**/*.rb'
+    - 'lib/xml/kit/templates/*.builder'
 
 Naming/FileName:
   Exclude:
@@ -84,9 +91,16 @@ Style/TrailingCommaInHashLiteral:
 RSpec/ExampleLength:
   Max: 80
 
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/xml/kit/templatable_spec.rb'
+
 RSpec/MultipleExpectations:
   Enabled: false
 
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
 RSpec/NamedSubject:
   Enabled: false
 
@@ -95,3 +109,7 @@ RSpec/NestedGroups:
 
 RSpec/SubjectStub:
   Enabled: false
+
+Style/DoubleNegation:
+  Exclude:
+    - 'lib/xml/kit/certificate.rb'

data/.travis.yml

@@ -1,11 +1,13 @@
 sudo: false
 language: ruby
-cache: bundler
 rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.5.5
+  - 2.6.3
+  - 2.7.2
+  - 3.0.0
+before_install:
+  - gem update --system
+  - gem install bundler
 script:
   - bin/cibuild
   - bin/lint

data/CHANGELOG.md

@@ -0,0 +1,60 @@
+Version 0.5.0
+
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.5.0] - 2021-01-30
+### Changed
+- Minimum Ruby 2.5+
+
+## [0.4.0] - 2019-04-30
+### Added
+- provide stable API for specifying the digest method and signature method.
+
+### Changed
+- drop support for ruby 2.2
+- drop support for ruby 2.3
+- use bundler 2.0
+
+## [0.3.1] - 2019-04-01
+### Changed
+- provide default symmetric cipher for `EncryptedData` element.
+- use `ENVELOPED_SIG` constant
+
+### Added
+- allow specifying id for `EncryptedData` element.
+
+## [0.3.0] - 2019-01-XX
+### Added
+- Default logger
+
+### Changed
+- \_assign does not coerce values by default.
+- errors are merged together instead of overwritten during attribute validation.
+
+[Unreleased]: https://github.com/saml-kit/xml-kit/compare/v0.5.0...HEAD
+[0.5.0]: https://github.com/saml-kit/xml-kit/compare/v0.4.0...v0.5.0
+[0.4.0]: https://github.com/saml-kit/xml-kit/compare/v0.3.1...v0.4.0
+[0.3.1]: https://github.com/saml-kit/xml-kit/compare/v0.3.0...v0.3.1
+[0.3.0]: https://github.com/saml-kit/xml-kit/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/saml-kit/xml-kit/compare/v0.1.14...v0.2.0
+[0.1.14]: https://github.com/saml-kit/xml-kit/compare/v0.1.13...v0.1.14
+[0.1.13]: https://github.com/saml-kit/xml-kit/compare/v0.1.12...v0.1.13
+[0.1.12]: https://github.com/saml-kit/xml-kit/compare/v0.1.11...v0.1.12
+[0.1.11]: https://github.com/saml-kit/xml-kit/compare/v0.1.10...v0.1.11
+[0.1.10]: https://github.com/saml-kit/xml-kit/compare/v0.1.9...v0.1.10
+[0.1.9]: https://github.com/saml-kit/xml-kit/compare/v0.1.8...v0.1.9
+[0.1.8]: https://github.com/saml-kit/xml-kit/compare/v0.1.7...v0.1.8
+[0.1.7]: https://github.com/saml-kit/xml-kit/compare/v0.1.6...v0.1.7
+[0.1.6]: https://github.com/saml-kit/xml-kit/compare/v0.1.5...v0.1.6
+[0.1.5]: https://github.com/saml-kit/xml-kit/compare/v0.1.4...v0.1.5
+[0.1.4]: https://github.com/saml-kit/xml-kit/compare/v0.1.3...v0.1.4
+[0.1.3]: https://github.com/saml-kit/xml-kit/compare/v0.1.1...v0.1.3
+[0.1.1]: https://github.com/saml-kit/xml-kit/compare/v0.1.1...v0.1.1
+[0.1.1]: https://github.com/saml-kit/xml-kit/compare/v0.1.0...v0.1.1
+[0.1.0]: https://github.com/saml-kit/xml-kit/compare/v0.1.0...v0.1.0

data/README.md

@@ -5,8 +5,7 @@
 [![Build Status](https://travis-ci.org/saml-kit/xml-kit.svg?branch=master)](https://travis-ci.org/saml-kit/xml-kit)
 [![Security](https://hakiri.io/github/saml-kit/xml-kit/master.svg)](https://hakiri.io/github/saml-kit/xml-kit/master)
 
-Xml::Kit is a toolkit for working with XML. It supports adding [XML
-Digital Signatures](https://www.w3.org/TR/xmldsig-core/)
+Xml::Kit is a toolkit for working with XML. It supports adding [XML Digital Signatures](https://www.w3.org/TR/xmldsig-core/)
 and [XML Encryption](https://www.w3.org/TR/2002/REC-xmlenc-core-20021210/Overview.html).
 
 ## Installation
@@ -29,11 +28,12 @@ Or install it yourself as:
 
 ```builder
 # ./templates/item.builder
+
 xml.instruct!
 xml.Item ID: id do
   signature_for reference_id: id, xml: xml
   xml.Encrypted do
-    encryption_for xml: xml do |encrypted_xml|
+    encrypt_data_for xml: xml do |encrypted_xml|
       encrypted_xml.EncryptMe do
         encrypted_xml.Secret "secret"
       end
@@ -48,12 +48,12 @@ require 'xml/kit'
 class Item
   include ::Xml::Kit::Templatable
 
-  def initialize
+  attr_reader :id
+
+  def initialize(signing_key_pair, encryption_certificate)
     @id = ::Xml::Kit::Id.generate
-    @signing_key_pair = ::Xml::Kit::KeyPair.generate(use: :signing)
-    @embed_signature = true
-    @encrypt = true
-    @encryption_certificate = ::Xml::Kit::KeyPair.generate(use: :encryption).certificate
+    sign_with(signing_key_pair)
+    encrypt_with(encryption_certificate)
   end
 
   def template_path
@@ -62,7 +62,9 @@ class Item
   end
 end
 
-puts Item.new.to_xml
+signing_key_pair = ::Xml::Kit::KeyPair.generate(use: :signing)
+encryption_certificate = ::Xml::Kit::KeyPair.generate(use: :encryption).certificate
+puts Item.new(signing_key_pair, encryption_certificate).to_xml
 ```
 
 This will produce something like the following:
@@ -86,8 +88,7 @@ This will produce something like the following:
     <SignatureValue>ZCSx4dad704jz0Z6rCMsnOs/oyVH3YBeEF9wtk2UFmWBW+VfhoBKw7N50GnzmAGCHyI6zajRPdff5i6UMDz3fOzh7rlROnqW0TXoG77xPiIfqJswCKE/4LzzBLrEHVbdUz90U8n0M1Ahbesrt+pbf/NkJghpvDhJW+w6oho7dyU6k57C5D//kTaSb7DvKte3a7/o8xWvPRztQhYekK+RyWjK9k/lU4WEXk5rGbx+QrD9rgIXBQOdcSjOtUosZJADz7uFod6AWRak246U62Xahz8JxE/1N22LhZY9whvB7s+c76f1Uv44NtF87D0P8UXs0TVx2jsnhEwLsT7DPQ6jDg==</SignatureValue>
     <KeyInfo>
       <X509Data>
-        <X509Certificate>MIIDQTCCAimgAwIBAgIBADANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJDQTEQMA4GA1UECAwHQWxiZXJ0YTEQMA4GA1UEBwwHQ2FsZ2FyeTEPMA0GA1UECgwGWG1sS2l0MQ8wDQYDVQQLDAZYbWxLaXQxDzANBgNVBAMMBlhtbEtpdDAeFw0xNzEyMzAxOTM1MjZaFw0xODAxMjkwNzAwMDBaMGQxCzAJBgNVBAYTAkNBMRAwDgYDVQQIDAdBbGJlcnRhMRAwDgYDVQQHDAdDYWxnYXJ5MQ8wDQYDVQQKDAZYbWxLaXQxDzANBgNVBAsMBlhtbEtpdDEPMA0GA1UEAwwGWG1sS2l0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz8yvaY1zvqiSTpDc0vFgS00N0R05ytanViNy0YrcAvLH2njvLOYi8e5lWAjCUzoWTe6FMJQySIHuzr9NvZztlQBp5tydmxDsOFQ3DrBhiqtyafdCd5s8OQz1CekavgToTOm5VdZEWLD7HSCFvHXeuiS/zwEh4yYpJBAERtsSaYxT7L1wNggxc6F6UEfF1vwrGxMNH/OUi4okeS773esXeRlP5fHyMUvVC70KHauSYt/kjNR8/WuZBOY8/kFv3XiErf0PNSAYhyGHozabv8hJ2Bho0+HR12P6Xv+qKXFlDnMeAOHy23eShuUpCEBaEPAG4o8w4g/lrn0nJ+e9XrYaNQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCWybi6buMD75KBCcyd5aRtSKavYoDaZlzuohKh4z1HEzHS/fbpbxVQOrfXtuawZjNxcn62LFIe/w68EImzYkAss8LKojRcaKnIeF1/3Pzo6qfnmFpaecfYvX3ZTtw9JPOd4chy2X2WFAUMRscjSvjNvTBzFOXg60F0UMDnWOWMbc5Di/aZD8r2s/RDE3QxcUou8QhBMc2nYw77mQsXBnWmBeUA2aGP
-8OG/fOgtBKkZnNF8gx7wuodbYSmKAfFGx8+CGtnkwNr4/hXgd1qg5KmsAx+9VYozCjGKSkVUIqC5khy6N+1Pb5jMKrMQ+QU9zGhylWoJ2jiK65hzUUVUESIB</X509Certificate>
+        <X509Certificate>MIIDQTCCAimgAwIBAgIBADANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQGEwJDQTEQMA4GA1UECAwHQWxiZXJ0YTEQMA4GA1UEBwwHQ2FsZ2FyeTEPMA0GA1UECgwGWG1sS2l0MQ8wDQYDVQQLDAZYbWxLaXQxDzANBgNVBAMMBlhtbEtpdDAeFw0xNzEyMzAxOTM1MjZaFw0xODAxMjkwNzAwMDBaMGQxCzAJBgNVBAYTAkNBMRAwDgYDVQQIDAdBbGJlcnRhMRAwDgYDVQQHDAdDYWxnYXJ5MQ8wDQYDVQQKDAZYbWxLaXQxDzANBgNVBAsMBlhtbEtpdDEPMA0GA1UEAwwGWG1sS2l0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz8yvaY1zvqiSTpDc0vFgS00N0R05ytanViNy0YrcAvLH2njvLOYi8e5lWAjCUzoWTe6FMJQySIHuzr9NvZztlQBp5tydmxDsOFQ3DrBhiqtyafdCd5s8OQz1CekavgToTOm5VdZEWLD7HSCFvHXeuiS/zwEh4yYpJBAERtsSaYxT7L1wNggxc6F6UEfF1vwrGxMNH/OUi4okeS773esXeRlP5fHyMUvVC70KHauSYt/kjNR8/WuZBOY8/kFv3XiErf0PNSAYhyGHozabv8hJ2Bho0+HR12P6Xv+qKXFlDnMeAOHy23eShuUpCEBaEPAG4o8w4g/lrn0nJ+e9XrYaNQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCWybi6buMD75KBCcyd5aRtSKavYoDaZlzuohKh4z1HEzHS/fbpbxVQOrfXtuawZjNxcn62LFIe/w68EImzYkAss8LKojRcaKnIeF1/3Pzo6qfnmFpaecfYvX3ZTtw9JPOd4chy2X2WFAUMRscjSvjNvTBzFOXg60F0UMDnWOWMbc5Di/aZD8r2s/RDE3QxcUou8QhBMc2nYw77mQsXBnWmBeUA2aGP8OG/fOgtBKkZnNF8gx7wuodbYSmKAfFGx8+CGtnkwNr4/hXgd1qg5KmsAx+9VYozCjGKSkVUIqC5khy6N+1Pb5jMKrMQ+QU9zGhylWoJ2jiK65hzUUVUESIB</X509Certificate>
       </X509Data>
     </KeyInfo>
   </Signature>
@@ -98,21 +99,12 @@ This will produce something like the following:
         <EncryptedKey xmlns="http://www.w3.org/2001/04/xmlenc#">
           <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
           <CipherData>
-            <CipherValue>rBJwm+gmL6eUHBZDXs2swIL3DiZ+MfmBPpM52eF0RWFtZv/gutY02KlsFLlm
-jc+DO7X5p9l1Br67FjGJrTdfSSqHf35cS1cioyaKLtgniSrD7Hf9d8qIuWt5
-6dLWjmCi21cePMJHhNiFe5yRjFHNp5LZ9dX5hvNXjbn0+p90fj8zlO2TWZv9
-atooON3BaYGCezZlmG0bWyEmloqKHiGjqaKtkdeSKJDzoo/AvubDEgz56rin
-Cpw26rEOg8BBd/KNfSXyDUifOOzXmn6myq+8+W/FFQ+6y+5SgtsbONRCqe2c
-KkNi3fYhilwLxWCaXFjONimEOkeG03yR5QnWhzEOpw==
-</CipherValue>
+            <CipherValue>rBJwm+gmL6eUHBZDXs2swIL3DiZ+MfmBPpM52eF0RWFtZv/gutY02KlsFLlmjc+DO7X5p9l1Br67FjGJrTdfSSqHf35cS1cioyaKLtgniSrD7Hf9d8qIuWt56dLWjmCi21cePMJHhNiFe5yRjFHNp5LZ9dX5hvNXjbn0+p90fj8zlO2TWZv9atooON3BaYGCezZlmG0bWyEmloqKHiGjqaKtkdeSKJDzoo/AvubDEgz56rinCpw26rEOg8BBd/KNfSXyDUifOOzXmn6myq+8+W/FFQ+6y+5SgtsbONRCqe2cKkNi3fYhilwLxWCaXFjONimEOkeG03yR5QnWhzEOpw==</CipherValue>
           </CipherData>
         </EncryptedKey>
       </KeyInfo>
       <CipherData>
-        <CipherValue>45rM0phzM/S/vpiq8Ev+uQZ6WL5qZ8av0UDVzWAlHn6Qr7zWYjHea+NF94lK
-pvmTPWQDEnfv2UW8l0VdCLc+51zHjluRE/xJh31Gk3rVuRJtLioSge/N9UM4
-5g901rE9
-</CipherValue>
+        <CipherValue>45rM0phzM/S/vpiq8Ev+uQZ6WL5qZ8av0UDVzWAlHn6Qr7zWYjHea+NF94lKpvmTPWQDEnfv2UW8l0VdCLc+51zHjluRE/xJh31Gk3rVuRJtLioSge/N9UM45g901rE9</CipherValue>
       </CipherData>
     </EncryptedData>
   </Encrypted>

data/bin/cibuild

@@ -17,5 +17,5 @@ export RUBY_HEAP_SLOTS_INCREMENT=400000
 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
 
 ruby -v
-gem install bundler --no-ri --no-rdoc --conservative
+gem install bundler --conservative -v '~> 2.0'
 bin/test

data/lib/xml/kit.rb

@@ -19,9 +19,12 @@ require 'xml/kit/crypto'
 require 'xml/kit/decryption'
 require 'xml/kit/decryption_error'
 require 'xml/kit/document'
+require 'xml/kit/encrypted_data'
+require 'xml/kit/encrypted_key'
 require 'xml/kit/encryption'
 require 'xml/kit/fingerprint'
 require 'xml/kit/id'
+require 'xml/kit/key_info'
 require 'xml/kit/key_pair'
 require 'xml/kit/self_signed_certificate'
 require 'xml/kit/signature'
@@ -32,6 +35,8 @@ require 'xml/kit/version'
 
 module Xml
   module Kit
+    class Error < StandardError; end
+
     class << self
       def logger
         @logger ||= Logger.new(STDOUT)
@@ -39,9 +44,13 @@ module Xml
 
       attr_writer :logger
 
-      def deprecate(message)
+      def deprecate(name, alternative: nil)
         @deprecation ||= ActiveSupport::Deprecation.new('1.0.0', 'xml-kit')
-        @deprecation.deprecation_warning(message)
+        if alternative
+          @deprecation.deprecation_warning(name, "Use `#{alternative}` instead")
+        else
+          @deprecation.deprecation_warning(name)
+        end
       end
     end
   end

data/lib/xml/kit/certificate.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require 'xml/kit/templatable'
+
 module Xml
   module Kit
-    # {include:file:spec/xml/certificate_spec.rb}
+    # {include:file:spec/xml/kit/certificate_spec.rb}
     class Certificate
+      include Templatable
       BASE64_FORMAT = %r(\A([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?\Z).freeze
       BEGIN_CERT = /-----BEGIN CERTIFICATE-----/.freeze
       END_CERT = /-----END CERTIFICATE-----/.freeze
@@ -109,9 +112,8 @@ module Xml
         x509.not_before
       end
 
-      def to_xml(pretty: false, xml: ::Builder::XmlMarkup.new)
-        xml = ::Xml::Kit::Template.new(self).to_xml(xml: xml)
-        pretty ? Nokogiri::XML(xml).to_xml(indent: 2) : xml
+      def key_info
+        @key_info ||= KeyInfo.new(x509: x509)
       end
 
       class << self

data/lib/xml/kit/crypto.rb

@@ -14,6 +14,20 @@ module Xml
       def self.cipher_for(algorithm, key)
         CIPHERS.find { |x| x.matches?(algorithm) }.new(algorithm, key)
       end
+
+      def self.cipher_registry(&block)
+        BlockRegistry.new(&block)
+      end
+
+      class BlockRegistry
+        def initialize(&factory)
+          @factory = factory
+        end
+
+        def cipher_for(algorithm, key)
+          @factory.call(algorithm, key)
+        end
+      end
     end
   end
 end

data/lib/xml/kit/crypto/oaep_cipher.rb

@@ -4,11 +4,14 @@ module Xml
   module Kit
     module Crypto
       class OaepCipher
-        ALGORITHM = "#{::Xml::Kit::Namespaces::XMLENC}rsa-oaep-mgf1p".freeze
+        ALGORITHM = "#{::Xml::Kit::Namespaces::XMLENC}rsa-oaep-mgf1p"
         ALGORITHMS = {
           ALGORITHM => true
         }.freeze
-        def initialize(_algorithm, key)
+        attr_reader :algorithm, :key
+
+        def initialize(algorithm, key)
+          @algorithm = algorithm
           @key = key
         end
 

data/lib/xml/kit/crypto/rsa_cipher.rb

@@ -4,9 +4,11 @@ module Xml
   module Kit
     module Crypto
       class RsaCipher
-        ALGORITHM = "#{::Xml::Kit::Namespaces::XMLENC}rsa-1_5".freeze
+        ALGORITHM = "#{::Xml::Kit::Namespaces::XMLENC}rsa-1_5"
+        attr_reader :algorithm, :key
 
-        def initialize(_algorithm, key)
+        def initialize(algorithm, key)
+          @algorithm = algorithm
           @key = key
         end
 

data/lib/xml/kit/crypto/symmetric_cipher.rb

@@ -4,7 +4,7 @@ module Xml
   module Kit
     module Crypto
       class SymmetricCipher
-        DEFAULT_ALGORITHM = "#{::Xml::Kit::Namespaces::XMLENC}aes256-cbc".freeze
+        DEFAULT_ALGORITHM = "#{::Xml::Kit::Namespaces::XMLENC}aes256-cbc"
         ALGORITHMS = {
           "#{::Xml::Kit::Namespaces::XMLENC}tripledes-cbc" => 'DES-EDE3-CBC',
           "#{::Xml::Kit::Namespaces::XMLENC}aes128-cbc" => 'AES-128-CBC',
@@ -12,11 +12,12 @@ module Xml
           "#{::Xml::Kit::Namespaces::XMLENC}aes256-cbc" => 'AES-256-CBC',
         }.freeze
 
-        attr_reader :key
+        attr_reader :algorithm, :key, :padding
 
-        def initialize(algorithm, key = nil)
+        def initialize(algorithm = DEFAULT_ALGORITHM, key = nil, padding = nil)
           @algorithm = algorithm
           @key = key || cipher.random_key
+          @padding = padding
         end
 
         def self.matches?(algorithm)
@@ -30,19 +31,39 @@ module Xml
         end
 
         def decrypt(cipher_text)
+          bytes = cipher_text.bytes
+          result = default_decrypt(
+            bytes[0...cipher.iv_len],
+            bytes[cipher.iv_len..-1]
+          )
+          return result if padding.nil?
+
+          padding_size = result.bytes.last
+          result[0...-padding_size]
+        end
+
+        def to_s
+          algorithm
+        end
+
+        protected
+
+        def default_decrypt(initialization_vector, data)
           cipher.decrypt
-          iv = cipher_text[0..cipher.iv_len - 1]
-          data = cipher_text[cipher.iv_len..-1]
-          # cipher.padding = 0
+          apply_padding_to(cipher)
           cipher.key = @key
-          cipher.iv = iv
-          cipher.update(data) + cipher.final
+          cipher.iv = initialization_vector.pack('c*')
+          cipher.update(data.pack('c*')) << cipher.final
         end
 
         private
 
         def cipher
-          @cipher ||= OpenSSL::Cipher.new(ALGORITHMS[@algorithm])
+          @cipher ||= OpenSSL::Cipher.new(ALGORITHMS[algorithm])
+        end
+
+        def apply_padding_to(cipher)
+          cipher.padding = padding unless padding.nil?
         end
       end
     end