aliquot-pay 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea8a43259ca5f437e1aa0d86b3c8ee3b93a257ec1ebcd20274cf1d3b0d7fdea6
-  data.tar.gz: f231c69d8d5d2314cc0f835cdb55b8e5b60a13200c37a5b6c5ec3eb7fee1c335
+  metadata.gz: d6ef1cc665eda9098620eba68b1ad54f84fbf95a7451000aed962e955df683bc
+  data.tar.gz: a6126ced2a1928849052ebed350163990d5f74aff97d26100f54a60189bb092f
 SHA512:
-  metadata.gz: 7d7d6ef3b956607876f48f02c29e24a0b9015cbc569470974bcd8232da578f4f3964bc0936d5f579fe7f9ad44146c95913211cac323205aa5076140ab4d4f7b7
-  data.tar.gz: 3952d7c0b71eca60300e7cea0472392d96f2827abfa721417ec68a17b5e007237f14698d69f80c3ad1f6ae4b467eddd1970695629b1773b1c4deb72aa7530c52
+  metadata.gz: 7ad4156b308d5f0cb263f0ceb2b64db99ec373f073bb71339cb0866812979448345cfee99beddebeaf816cdd38e0d17cb793c39832f366dfa108c9d368a257a8
+  data.tar.gz: 87a621a3d085c84cec0b393a737a3d05ae5d7afa5b144cfecac0babd1e8ce55d06727428b7fabad9f247c3191a2b26c6ae3369b9c2137e0930d4a9fb8f7ab362

data/lib/aliquot-pay/util.rb

@@ -12,8 +12,13 @@ module AliquotPay
     end
 
     def self.derive_keys(ephemeral_public_key, shared_secret, info)
-      ikm = ephemeral_public_key + shared_secret
-      hbytes = HKDF.new(ikm, algorithm: 'SHA256', info: info).next_bytes(32)
+      input_keying_material = ephemeral_public_key + shared_secret
+      if OpenSSL.const_defined?(:KDF) && OpenSSL::KDF.respond_to?(:hkdf)
+        h = OpenSSL::Digest::SHA256.new
+        hbytes = OpenSSL::KDF.hkdf(input_keying_material, hash: h, salt: '', length: 32, info: info)
+      else
+        hbytes = HKDF.new(input_keying_material, algorithm: 'SHA256', info: info).next_bytes(32)
+      end
 
       {
         aes_key: hbytes[0..15],

data/lib/aliquot-pay.rb

@@ -90,18 +90,18 @@ module AliquotPay
   end
 
   # payment:: Google Pay token as a ruby Hash
-  # signing_key:: OpenSSL::PKEY::EC
-  # recipient::   OpenSSL::PKey::EC
-  # message::     SignedMessage
-  def self.generate_token(payment, signing_key, recipient, message = nil)
-    message ||= AliquotPay.encrypt(JSON.unparse(payment), recipient)
+  # signing_key::           OpenSSL::PKEY::EC
+  # recipient::             OpenSSL::PKey::EC
+  # encrypted_message::     SignedMessage
+  def self.generate_token(payment, signing_key, recipient, signed_message = nil)
+    signed_message ||= JSON.unparse(AliquotPay.encrypt(JSON.unparse(payment), recipient))
 
-    signature_string = AliquotPay.signature_string(JSON.unparse(message))
+    signature_string = AliquotPay.signature_string(signed_message)
 
     {
       'protocolVersion' => 'ECv1',
       'signature' =>       AliquotPay.sign(signing_key, signature_string),
-      'signedMessage' =>   JSON.unparse(message),
+      'signedMessage' =>   signed_message,
     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliquot-pay
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Clearhaus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-28 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hkdf