onnistuu_fi 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d8c750ed0ddbe0401d908a47a5dc306b1ee07b5
-  data.tar.gz: bb7a70479ed65d1c3a98ee28062275dbb0dc27ec
+  metadata.gz: 8e2d47ad652d33ffa6f0cf337649740357d36d2a
+  data.tar.gz: a4cd132595c28603f3239d3feba4193a1b8f12f3
 SHA512:
-  metadata.gz: 76377b3df828ce8b4affe483d69158c0fa7759b3beba5afeb0ea09e7a4791803d67b5d1d7e3c1cc13cb30c1ae4d476cbfd28f0722eae3c3f81009e369a2bd9f4
-  data.tar.gz: 2d63342c6558ed73b7707f90db5480cc2ac978ee5db1728c85a33da06be2f1926551ef3ee30f6cc0a2f7636d8d856c5b91e917b859b666855e3ab26928912a3a
+  metadata.gz: 9ea37983e3b854b88474c52e3ae50a2949dbd7d2cad1beb8c8ee35f9152218d5781ac3e293e0cbc6a7a0846d09450b8a0fd5c68992c8f6597bc46dc5c04c971a
+  data.tar.gz: 0d89a6fe38dd27566c021c28d22608d1f5461308f2d3382502833055298550007a88d9a47402eb3a939988a516107a84e22d5c2d3f4ca86e4de9df326b864a92

data/README.md

@@ -20,7 +20,7 @@ Or install it yourself as:
 
 ## Dependencies
 
-Mcrypt needs to be installed for the library to work.
+None.
 
 ## Usage
 
@@ -81,3 +81,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/kiskolabs/onnistuu_fi.
 
+## License
+
+The library is released under the MIT License.

data/bin/setup

@@ -4,4 +4,3 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
-brew install mcrypt

data/lib/onnistuu_fi/form.rb

@@ -23,6 +23,7 @@ module OnnistuuFi
       "<form action='#{API_ENDPOINT}' method='post'>
         #{fields.compact.join("\n")}
         <input type='hidden' name='padding' value='pkcs5' />
+        <input type='hidden' name='cipher' value='rijndael-128' />
         #{@options[:button]}
       </form>"
     end

data/lib/onnistuu_fi/signer.rb

@@ -1,31 +1,36 @@
-require "mcrypt"
 require "base64"
 require "openssl"
 
 module OnnistuuFi
   class Signer
-    def initialize(client_identifier, encryption_key)
-      @client_identifier = client_identifier
-      @encryption_key = Base64.decode64(encryption_key)
+    attr_accessor :key
+
+    def initialize(_key, keycode)
+      self.key = Base64.decode64(keycode)
     end
 
-    # Returns [base64_iv, base64_encrypted_data]
-    def encrypt(data)
-      iv = OpenSSL::Cipher::Cipher.new("AES-256-CBC").random_iv.unpack("H*").first
-      mcrypt = Mcrypt.new(:rijndael_256, :cbc, @encryption_key, iv, :pkcs)
+    def encrypt(message)
+      return nil if message.nil?
 
-      [Base64.encode64(iv), Base64.encode64(mcrypt.encrypt(JSON.dump(data)))]
+      iv = OpenSSL::Cipher::Cipher.new("AES-128-CBC").random_iv
+      aes = OpenSSL::Cipher.new('AES-256-CBC')
+      aes.encrypt
+      aes.key = key
+      aes.iv = iv
+      encrypted_data = aes.update(JSON.dump(message)) + aes.final
+      [Base64.encode64(iv), Base64.encode64(encrypted_data)]
     end
 
-    # Parameters:
-    # - encrypted data in base64
-    # - iv in base64
-    #
-    # Returns decrypted data
-    def decrypt(encrypted, iv)
-      mcrypt = Mcrypt.new(:rijndael_256, :cbc, @encryption_key, Base64.decode64(iv), :pkcs)
-
-      JSON.load(mcrypt.decrypt(Base64.decode64(encrypted)))
+    def decrypt(encrypted_data, iv)
+      return nil if encrypted_data.nil?
+      encrypted_data = Base64.decode64(encrypted_data).strip
+      iv = Base64.decode64(iv).strip
+      aes = OpenSSL::Cipher.new('AES-256-CBC')
+      aes.decrypt
+      aes.key = key
+      aes.iv = iv
+      message = (aes.update(encrypted_data) + aes.final)
+      JSON.load(message)
     end
   end
 end

data/lib/onnistuu_fi/version.rb

@@ -1,3 +1,3 @@
 module OnnistuuFi
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/onnistuu_fi.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Implements Onnistuu.fi interface.}
   spec.description   = %q{Implements Onnistuu.fi interface}
   spec.homepage      = "https://github.com/kiskolabs/onnistuu_fi"
+  spec.licenses    = ["MIT"]
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -31,6 +32,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.8.0"
   spec.add_development_dependency "byebug"
-  spec.add_dependency "aes", "~> 0.5.0"
-  spec.add_dependency "ruby-mcrypt", "~> 0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onnistuu_fi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Vesa Vänskä
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: ruby-mcrypt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 description: Implements Onnistuu.fi interface
 email:
 - vesa@vesavanska.com
@@ -130,7 +102,8 @@ files:
 - lib/onnistuu_fi/version.rb
 - onnistuu_fi.gemspec
 homepage: https://github.com/kiskolabs/onnistuu_fi
-licenses: []
+licenses:
+- MIT
 metadata:
   allowed_push_host: https://rubygems.org
 post_install_message: 
@@ -149,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Implements Onnistuu.fi interface.