pedicel-pay 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12084da10c8a033bfa52a0bb9ab055780a1985760044e98f964afec44143dc27
-  data.tar.gz: 2c5c9b7e328b0ce6fb94b198a85e0212d503046b30f1e797145d0ebf343a3249
+  metadata.gz: 85d66f4d33714f24c34da1a20ae870a91b3dd0b91384384837d6800b465532c9
+  data.tar.gz: 351a005183dba34cc6e28ef1535291ad5cb491d488bdc00b44a44c83f1a1d1a8
 SHA512:
-  metadata.gz: 66085fa5b654cd9bfe01a347865df7332435b4047ed0115a5cdff639ddd6fe524808cfc80f50aed1017eb454ac1c71f1191597cb1641f49c2d2915ae15de2ba7
-  data.tar.gz: 0c4f411ea8648e9b86c848197a4e6a57b26b30f0ebd621f4c453a9af0686521c5b2f183c039a47b2a30c0b63d73759ebbdb1e8cbd3c9d3ac085e5a63f18425f5
+  metadata.gz: 6510894a8d6c86b1ecc979c5cfa6f411aaf2fe9fa09f3c70e1157d45fbff9e9ba0dd7b7d0f55049e3b6006055b25d95e3544dd22528807a7d30f28f20498b7c4
+  data.tar.gz: a4ccc1389c256f096ccd86eee3488b64e25664c03972044357709f5754f2518acc627f2cc155219f54790cf018bffaf3578dcba1715d964f57ae4ec7b3d12a0b

data/lib/pedicel-pay/backend.rb

@@ -140,7 +140,7 @@ module PedicelPay
                else raise ArgumentError, 'invalid recipient'
                end
 
-      ephemeral_seckey = OpenSSL::PKey::EC.new(PedicelPay::EC_CURVE).generate_key
+      ephemeral_seckey = OpenSSL::PKey::EC.generate(PedicelPay::EC_CURVE)
 
       [ephemeral_seckey.dh_compute_key(pubkey), ephemeral_seckey.public_key]
     end
@@ -158,8 +158,7 @@ module PedicelPay
     end
 
     def self.generate_ca(config: PedicelPay.config)
-      key = OpenSSL::PKey::EC.new(PedicelPay::EC_CURVE)
-      key.generate_key
+      key = OpenSSL::PKey::EC.generate(PedicelPay::EC_CURVE)
 
       cert = OpenSSL::X509::Certificate.new
       cert.version = 2 # https://www.ietf.org/rfc/rfc5280.txt -> Section 4.1, search for "v3(2)".
@@ -183,8 +182,7 @@ module PedicelPay
     end
 
     def self.generate_intermediate(ca_key:, ca_certificate:, config: PedicelPay.config)
-      key = OpenSSL::PKey::EC.new(PedicelPay::EC_CURVE)
-      key.generate_key
+      key = OpenSSL::PKey::EC.generate(PedicelPay::EC_CURVE)
 
       cert = OpenSSL::X509::Certificate.new
       # https://www.ietf.org/rfc/rfc5280.txt -> Section 4.1, search for "v3(2)".
@@ -216,8 +214,7 @@ module PedicelPay
     end
 
     def self.generate_leaf(intermediate_key:, intermediate_certificate:, config: PedicelPay.config)
-      key = OpenSSL::PKey::EC.new(PedicelPay::EC_CURVE)
-      key.generate_key
+      key = OpenSSL::PKey::EC.generate(PedicelPay::EC_CURVE)
 
       cert = OpenSSL::X509::Certificate.new
       cert.version = 2 # https://www.ietf.org/rfc/rfc5280.txt -> Section 4.1, search for "v3(2)".

data/lib/pedicel-pay/client.rb

@@ -13,8 +13,7 @@ module PedicelPay
     end
 
     def generate_key
-      @key = OpenSSL::PKey::EC.new(PedicelPay::EC_CURVE)
-      @key.generate_key
+      @key = OpenSSL::PKey::EC.generate(PedicelPay::EC_CURVE)
 
       @key
     end

data/lib/pedicel-pay/helper.rb

@@ -9,11 +9,24 @@ module PedicelPay
     end
 
     def self.ec_key_to_pkey_public_key(ec_key)
-      # EC#public_key is not a PKey public key, but an EC point.
-      pub = OpenSSL::PKey::EC.new(ec_key.group)
-      pub.public_key = ec_key.is_a?(OpenSSL::PKey::PKey) ? ec_key.public_key : ec_key
+      # OpenSSL::PKey::EC#public_key is not a PKey public key but an EC point.
+      # The ASN1 detour below is because OpenSSL < 3 does not have
+      # OpenSSL::PKey::EC#public_to_pem. Otherwise, this method could be served
+      # directly to OpenSSL::PKey::EC.new. An approach respecting the
+      # immutability of a PKey and the potential absence of #public_to_pem
+      # is necessary. See https://stackoverflow.com/a/75572569.
+      point = ec_key.is_a?(OpenSSL::PKey::PKey) ? ec_key.public_key : ec_key
+      asn1 = OpenSSL::ASN1::Sequence(
+        [
+          OpenSSL::ASN1::Sequence([
+            OpenSSL::ASN1::ObjectId('id-ecPublicKey'),
+            OpenSSL::ASN1::ObjectId(ec_key.group.curve_name)
+          ]),
+          OpenSSL::ASN1::BitString(point.to_octet_string(:uncompressed))
+        ]
+      )
 
-      pub
+      OpenSSL::PKey::EC.new(asn1.to_der)
     end
 
     def self.bytestring_to_hex(string)

data/lib/pedicel-pay/version.rb

@@ -1,3 +1,3 @@
 module PedicelPay
-  VERSION = '0.0.6'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pedicel-pay
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Clearhaus A/S
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2023-09-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -44,43 +30,29 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.20'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.20'
-- !ruby/object:Gem::Dependency
-  name: openssl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
-description: 
+        version: '0'
+description:
 email: hello@clearhaus.com
 executables:
 - pedicel-pay
@@ -100,7 +72,7 @@ homepage: https://github.com/clearhaus/pedicel-pay
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Backend and client part of Apple Pay
 test_files: []