openssl-signature_algorithm 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5b527f33fd6b399b9b6c6baaebc173be1a848e3de4249dfc12c2640fbecf964
-  data.tar.gz: ad5361e7381c7aa34f66dbe94e32c7a5e54fcedd9a536897588728fd7f8e2771
+  metadata.gz: 05b32cb5c229b287708d0931b8ac52b8c90c98f53d31e146df38406870300e95
+  data.tar.gz: 0b35e770ff3342d8d7d7008f8a76a4cb40e63dfe756676276e84e72da0af6677
 SHA512:
-  metadata.gz: 1e532e2f5ae196cc3136f7eefaee626bfb80454cd581c80f067e6c237769a262d0188c9c82a32a40193b7218238c979231861e64445074264eebf5d03dc16f5f
-  data.tar.gz: 2dcfffdf4680abeb725c4f15a36ac8fa80e49061d3408fba763270701ccc70c7982c6630ac26c8dcb56cd77f0b303e0431c1f923202d8eaccb0c01ede519d14d
+  metadata.gz: f5bfe46225bf0fa061ef6046d94e7297bfd124be0b95cd4fc3cc125f8fcd58a288a8945a64f9af8f50ff3fdd22c148e3495bd643c9de5b535ca8ecb14c266649
+  data.tar.gz: 34a46fea3bde198cdbbc3b9e024dec9d635aa8c15484a819d8350bdd3b3a996dff75b6f64b6f9971f890c2796873594c555e0970f83a0e72adce9b22bf54c992

data/.github/workflows/build.yml

@@ -16,22 +16,39 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - 3.0.0
-          - 2.7.2
+          - 3.2.0
+          - 3.1.3
+          - 3.0.5
+          - 2.7.7
           - 2.6.6
           - 2.5.8
           - 2.4.10
         gemfile:
+          - openssl_3_1
+          - openssl_3_0
           - openssl_2_2
           - openssl_2_1
-          - openssl_2_0
+        exclude:
+          - ruby-version: '2.4.10'
+            gemfile: openssl_3_0
+          - ruby-version: '2.5.8'
+            gemfile: openssl_3_0
+          - ruby-version: '2.4.10'
+            gemfile: openssl_3_1
+          - ruby-version: '2.5.8'
+            gemfile: openssl_3_1
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
     - uses: actions/checkout@v2
     - run: rm Gemfile.lock
-    - uses: ruby/setup-ruby@v1
+    - name: Set up Ruby ${{ matrix.ruby }}
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
-    - run: bundle exec rake
+    - name: Run rubocop
+      run: bundle exec rubocop
+      if: ${{ matrix.ruby == '3.2.0' }}
+    - name: Run tests
+      run: bundle exec rspec

data/.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   TargetRubyVersion: 2.4
   DisabledByDefault: true
+  NewCops: disable
   Exclude:
     - "gemfiles/**/*"
     - "vendor/bundle/**/*"
@@ -20,6 +21,9 @@ Layout/LineLength:
 Lint:
   Enabled: true
 
+Lint/MissingSuper:
+  Enabled: false
+
 Naming:
   Enabled: true
 

data/Appraisals

@@ -1,5 +1,13 @@
 # frozen_string_literal: true
 
+appraise "openssl_3_1" do
+  gem "openssl", "~> 3.1.0"
+end
+
+appraise "openssl_3_0" do
+  gem "openssl", "~> 3.0.0"
+end
+
 appraise "openssl_2_2" do
   gem "openssl", "~> 2.2.0"
 end
@@ -7,7 +15,3 @@ end
 appraise "openssl_2_1" do
   gem "openssl", "~> 2.1.0"
 end
-
-appraise "openssl_2_0" do
-  gem "openssl", "~> 2.0.0"
-end

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [v1.3.0] - 2023-02-15
+
+- Loose OpenSSL dependency to support 3.1 users. Thanks @bdewater <3
+
+## [v1.2.1] - 2022-06-05
+
+- Support OpenSSL ~>3.0.0. Credits to @ClearlyClaire <3
+
 ## [v1.1.1] - 2021-02-11
 
 ### Fixed
@@ -84,6 +92,8 @@
 - `OpenSSL::SignatureAlgorithm::RSAPSS`
 - `OpenSSL::SignatureAlgorithm::RSAPKCS1`
 
+[v1.3.0]: https://github.com/cedarcode/openssl-signature_algorithm/compare/v1.2.1...v1.3.0/
+[v1.2.1]: https://github.com/cedarcode/openssl-signature_algorithm/compare/v1.1.1...v1.2.1/
 [v1.1.1]: https://github.com/cedarcode/openssl-signature_algorithm/compare/v1.1.0...v1.1.1/
 [v1.1.0]: https://github.com/cedarcode/openssl-signature_algorithm/compare/v1.0.0...v1.1.0/
 [v1.0.0]: https://github.com/cedarcode/openssl-signature_algorithm/compare/v0.4.0...v1.0.0/
@@ -94,3 +104,5 @@
 [v0.1.0]: https://github.com/cedarcode/openssl-signature_algorithm/compare/41887c277dc7fa0c884ccf8924cf990ff76784d9...v0.1.0/
 
 [@santiagorodriguez96]: https://github.com/santiagorodriguez96
+[@ClearlyClaire]: https://github.com/clearlyclaire
+[@bdewater]: https://github.com/bdewater

data/Gemfile

@@ -10,4 +10,4 @@ gem "byebug", "~> 11.0"
 gem "ed25519", "~> 1.2"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
-gem "rubocop", "~> 0.80.1"
+gem "rubocop", "~> 1.0"

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    openssl-signature_algorithm (1.1.1)
-      openssl (~> 2.0)
+    openssl-signature_algorithm (1.2.1)
+      openssl (> 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -11,18 +11,19 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.0)
+    ast (2.4.2)
     byebug (11.1.1)
     diff-lcs (1.3)
     ed25519 (1.2.4)
-    jaro_winkler (1.5.4)
-    openssl (2.2.0)
-    parallel (1.19.1)
-    parser (2.7.0.5)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
+    json (2.6.3)
+    openssl (3.0.0)
+    parallel (1.22.1)
+    parser (3.2.1.0)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
     rake (13.0.1)
-    rexml (3.2.4)
+    regexp_parser (2.7.0)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -36,17 +37,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    rubocop (0.80.1)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.45.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
     thor (1.0.1)
-    unicode-display_width (1.6.1)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -58,7 +63,7 @@ DEPENDENCIES
   openssl-signature_algorithm!
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 0.80.1)
+  rubocop (~> 1.0)
 
 BUNDLED WITH
-   2.2.8
+   2.3.26

data/gemfiles/openssl_2_1.gemfile

@@ -4,10 +4,10 @@ source "https://rubygems.org"
 
 gem "appraisal", "~> 2.2"
 gem "byebug", "~> 11.0"
+gem "ed25519", "~> 1.2"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
-gem "rubocop", "~> 0.80.1"
-gem "ed25519", "~> 1.2"
+gem "rubocop", "~> 1.0"
 gem "openssl", "~> 2.1.0"
 
 gemspec path: "../"

data/gemfiles/openssl_2_2.gemfile

@@ -4,10 +4,10 @@ source "https://rubygems.org"
 
 gem "appraisal", "~> 2.2"
 gem "byebug", "~> 11.0"
+gem "ed25519", "~> 1.2"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
-gem "rubocop", "~> 0.80.1"
-gem "ed25519", "~> 1.2"
+gem "rubocop", "~> 1.0"
 gem "openssl", "~> 2.2.0"
 
 gemspec path: "../"

data/gemfiles/{openssl_2_0.gemfile → openssl_3_0.gemfile}

@@ -4,10 +4,10 @@ source "https://rubygems.org"
 
 gem "appraisal", "~> 2.2"
 gem "byebug", "~> 11.0"
+gem "ed25519", "~> 1.2"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
-gem "rubocop", "~> 0.80.1"
-gem "ed25519", "~> 1.2"
-gem "openssl", "~> 2.0.0"
+gem "rubocop", "~> 1.0"
+gem "openssl", "~> 3.0.0"
 
 gemspec path: "../"

data/gemfiles/openssl_3_1.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 2.2"
+gem "byebug", "~> 11.0"
+gem "ed25519", "~> 1.2"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rubocop", "~> 1.0"
+gem "openssl", "~> 3.1.0"
+
+gemspec path: "../"

data/lib/openssl/signature_algorithm/ecdsa.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "delegate"
 require "openssl"
 require "openssl/signature_algorithm/base"
 
@@ -8,9 +9,9 @@ module OpenSSL
     class ECDSA < Base
       BYTE_LENGTH = 8
 
-      class SigningKey < OpenSSL::PKey::EC
+      class SigningKey < DelegateClass(OpenSSL::PKey::EC)
         def initialize(*args)
-          super(*args).generate_key
+          super(OpenSSL::PKey::EC.generate(*args))
         end
 
         def verify_key
@@ -18,7 +19,11 @@ module OpenSSL
         end
       end
 
-      class VerifyKey < OpenSSL::PKey::EC::Point
+      class VerifyKey < DelegateClass(OpenSSL::PKey::EC::Point)
+        def initialize(*args)
+          super(OpenSSL::PKey::EC::Point.new(*args))
+        end
+
         def self.deserialize(pem_string)
           new(OpenSSL::PKey::EC.new(pem_string).public_key)
         end
@@ -30,10 +35,20 @@ module OpenSSL
         def ec_key
           @ec_key ||=
             begin
-              ec_key = OpenSSL::PKey::EC.new(group)
-              ec_key.public_key = self
-
-              ec_key
+              # RFC5480 SubjectPublicKeyInfo
+              asn1 = OpenSSL::ASN1::Sequence(
+                [
+                  OpenSSL::ASN1::Sequence(
+                    [
+                      OpenSSL::ASN1::ObjectId("id-ecPublicKey"),
+                      OpenSSL::ASN1::ObjectId(group.curve_name),
+                    ]
+                  ),
+                  OpenSSL::ASN1::BitString(to_octet_string(:uncompressed))
+                ]
+              )
+
+              OpenSSL::PKey::EC.new(asn1.to_der)
             end
         end
 

data/lib/openssl/signature_algorithm/rsa.rb

@@ -1,22 +1,31 @@
 # frozen_string_literal: true
 
+require "delegate"
 require "openssl"
 require "openssl/signature_algorithm/base"
 
 module OpenSSL
   module SignatureAlgorithm
     class RSA < Base
-      class SigningKey < OpenSSL::PKey::RSA
+      class SigningKey < DelegateClass(OpenSSL::PKey::RSA)
+        def initialize(*args)
+          super(OpenSSL::PKey::RSA.new(*args))
+        end
+
         def verify_key
           VerifyKey.new(public_key.to_pem)
         end
       end
 
-      class VerifyKey < OpenSSL::PKey::RSA
+      class VerifyKey < DelegateClass(OpenSSL::PKey::RSA)
         class << self
           alias_method :deserialize, :new
         end
 
+        def initialize(*args)
+          super(OpenSSL::PKey::RSA.new(*args))
+        end
+
         def serialize
           to_pem
         end

data/lib/openssl/signature_algorithm/version.rb

@@ -2,6 +2,6 @@
 
 module OpenSSL
   module SignatureAlgorithm
-    VERSION = "1.1.1"
+    VERSION = "1.3.0"
   end
 end

data/openssl-signature_algorithm.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "openssl", "~> 2.0"
+  spec.add_runtime_dependency "openssl", "> 2.0"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: openssl-signature_algorithm
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Gonzalo Rodriguez
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: ECDSA, EdDSA, RSA-PSS and RSA-PKCS#1 algorithms for ruby
@@ -45,9 +45,10 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/.bundle/config
-- gemfiles/openssl_2_0.gemfile
 - gemfiles/openssl_2_1.gemfile
 - gemfiles/openssl_2_2.gemfile
+- gemfiles/openssl_3_0.gemfile
+- gemfiles/openssl_3_1.gemfile
 - lib/openssl/signature_algorithm.rb
 - lib/openssl/signature_algorithm/base.rb
 - lib/openssl/signature_algorithm/ecdsa.rb
@@ -65,7 +66,7 @@ metadata:
   homepage_uri: https://github.com/cedarcode/openssl-signature_algorithm
   source_code_uri: https://github.com/cedarcode/openssl-signature_algorithm
   changelog_uri: https://github.com/cedarcode/openssl-signature_algorithm/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,8 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.8
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: ECDSA, EdDSA, RSA-PSS and RSA-PKCS#1 algorithms for ruby
 test_files: []