aliquot-pay 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f1155997b8d956147e17ca76c1fa36341675f9a8ba4932b3d6a1a6152bec885
-  data.tar.gz: aec39bc7bac88cc34ae9d36b4d09af287c42247b23c1e134c930e90d6dc86c75
+  metadata.gz: df10b773da7321ea564c012fd5d487c07c0779ced77d1535e3b3a10691157b39
+  data.tar.gz: c6231c0006e33298f414ced2e286ac45ef4df5f16a2efa633a8025e1373fca15
 SHA512:
-  metadata.gz: d096ada956941cb30fd187db28f8b83665bd8b667280cd834fed2b2b1fa9535d73a163941674ef11702f429fef1b5804168059f56e02d53478bf0212e9fe3f30
-  data.tar.gz: ea714b68416696db99049926200cefdcc65f2a14ac55ee6d5ead1c7132d4de0420b3b429610ef3637e1ed2aad3763edcc3162fa8a873bd686a915f04e3e53806
+  metadata.gz: 32790400342af932a01adeaaf8cb0ed943ffe2343954972deb4d20f7e5e34482ff71ab924f395221db3affd0128cfeb8b6ae95cc19d1c19dbcedde0d2ca963a6
+  data.tar.gz: 23aa8bec6cb97d8ec513e1fb6323f35b60f7ad1baca8627d4091e2898b1d1a03f38882b1949f34f56064bde33ba330978b84b0a69c0f321c35639bba26539d02

data/lib/aliquot-pay/util.rb

@@ -4,7 +4,7 @@ require 'hkdf'
 class AliquotPay
   class Util
     def self.generate_ephemeral_key
-      OpenSSL::PKey::EC.new(AliquotPay::EC_CURVE).generate_key
+      OpenSSL::PKey::EC.generate(AliquotPay::EC_CURVE)
     end
 
     def self.generate_shared_secret(private_key, public_key)

data/lib/aliquot-pay.rb

@@ -18,7 +18,7 @@ class AliquotPay
   attr_accessor :signed_key, :signatures
   attr_accessor :key_expiration, :key_value
   attr_accessor :encrypted_message, :cleartext_message, :ephemeral_public_key, :tag
-  attr_accessor :message_expiration, :message_id, :payment_method, :payment_method_details
+  attr_accessor :message_expiration, :message_id, :payment_method, :payment_method_details, :gateway_merchant_id
   attr_accessor :pan, :expiration_month, :expiration_year, :auth_method
   attr_accessor :cryptogram, :eci_indicator
 
@@ -34,7 +34,7 @@ class AliquotPay
   end
 
   def extract_root_signing_keys
-    key = Base64.strict_encode64(eckey_to_public(ensure_root_key).to_der)
+    key = Base64.strict_encode64(eckey_to_public(ensure_root_key))
     {
       'keys' => [
         'protocolVersion' => @protocol_version,
@@ -43,16 +43,19 @@ class AliquotPay
     }.to_json
   end
 
-  def eckey_to_public(key)
-    p = OpenSSL::PKey::EC.new(EC_CURVE)
-
-    p.public_key = key.public_key
-
-    p
+  if OpenSSL::VERSION >= '3'
+    # pkeys are immutable on OpenSSL >=3.0
+    def eckey_to_public(key)
+      key.public_to_der
+    end
+  else
+    def eckey_to_public(key)
+      k = OpenSSL::PKey::EC.new(EC_CURVE)
+      k.public_key = key.public_key
+      k.to_der
+    end
   end
 
-  #private
-
   def sign(key, message)
     d = OpenSSL::Digest::SHA256.new
     def key.private?; private_key?; end
@@ -60,7 +63,7 @@ class AliquotPay
   end
 
   def encrypt(cleartext_message)
-    @recipient ||= OpenSSL::PKey::EC.new('prime256v1').generate_key
+    @recipient ||= OpenSSL::PKey::EC.generate('prime256v1')
     @info ||= 'Google'
 
     eph = AliquotPay::Util.generate_ephemeral_key
@@ -113,6 +116,7 @@ class AliquotPay
 
   def build_cleartext_message
     return @cleartext_message if @cleartext_message
+
     default_message_id = Base64.strict_encode64(OpenSSL::Random.random_bytes(24))
     default_message_expiration = ((Time.now.to_f + 60 * 5) * 1000).round.to_s
 
@@ -122,6 +126,14 @@ class AliquotPay
       'paymentMethod'        => @payment_method || 'CARD',
       'paymentMethodDetails' => build_payment_method_details
     }
+
+    if @protocol_version == :ECv2
+      @cleartext_message.merge!(
+        'gatewayMerchantId' => @gateway_merchant_id || 'SOME GATEWAY MERCHANT ID'
+      )
+    end
+
+    @cleartext_message
   end
 
   def build_signed_message
@@ -143,13 +155,11 @@ class AliquotPay
     return @signed_key if @signed_key
     ensure_intermediate_key
 
-    if @intermediate_key.private_key? || @intermediate_key.public_key?
-      public_key = eckey_to_public(@intermediate_key)
-    else
+    if !@intermediate_key.private_key? && !@intermediate_key.public_key?
       fail 'Intermediate key must be public and private key'
     end
 
-    default_key_value      = Base64.strict_encode64(public_key.to_der)
+    default_key_value      = Base64.strict_encode64(eckey_to_public(@intermediate_key))
     default_key_expiration = "#{Time.now.to_i + 3600}000"
 
     @signed_key = {
@@ -163,11 +173,11 @@ class AliquotPay
   end
 
   def ensure_root_key
-    @root_key ||= OpenSSL::PKey::EC.new(EC_CURVE).generate_key
+    @root_key ||= OpenSSL::PKey::EC.generate(EC_CURVE)
   end
 
   def ensure_intermediate_key
-    @intermediate_key ||= OpenSSL::PKey::EC.new(EC_CURVE).generate_key
+    @intermediate_key ||= OpenSSL::PKey::EC.generate(EC_CURVE)
   end
 
   def build_signature

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliquot-pay
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Clearhaus
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hkdf
@@ -30,42 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-description: 
+description:
 email: hello@clearhaus.com
 executables: []
 extensions: []
@@ -92,7 +64,7 @@ homepage: https://github.com/clearhaus/aliquot-pay
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Generates Google Pay test dummy tokens
 test_files: []