aliquot-pay 2.0.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b09f20a26a4ba4bd85ef274044bca8f84fd5471c4393b7e14e3aae8a8ee9e48
-  data.tar.gz: aa5e97d77be4ce999063378eb5bce12f4bbd6e7509fbd3f100388281197175cd
+  metadata.gz: 5c5bffd61e042fd964cca3d4c766cd63ce6e5434602f28cf17e54a70db6001e1
+  data.tar.gz: 0b4c0729cba721c98abe88b1bd7ef70a1205acf71f6eba6f03d77e66bc01f252
 SHA512:
-  metadata.gz: 1b0747731b0320552cc308b76a32c2786358a9ddd74136498da0b3145981f9584ae184d06fe903cede3b815fc6dc5f82fbccf24dde754aebb3a35961d5df4db9
-  data.tar.gz: 71018fd9c9885e435a298bd8138f471494bba598a0608c7e52f73d85625b597d4f2993df82cae1c4448dfa6bdd14682864d10692e855433cc14010d7cf032a5e
+  metadata.gz: e095b875006d99d6e95d6768d482848ba7c304241f72653be631386ac6c2b56b01a79e4d2980c098e6329e2e34635ab11f8569f576389456439d3bf9760e4f3c
+  data.tar.gz: b9f02b833e505701d13262d0888168b195f0672d29ab4df64e437189e7d9302765885e0a74bdd992fada5793a4b60006b1febdfa77769aa3c36ee73a84d587ee

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

@@ -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
@@ -143,13 +146,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 +164,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.0.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Clearhaus
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2023-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hkdf
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Generates Google Pay test dummy tokens