openssl-signature_algorithm 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973a01f83e137fb88da90dee332beee6e310b0b9e2e3e7a2b1e542483af0e6ef
-  data.tar.gz: 93e691f2283a6d1acbd0448a647ba90f73171fc56a39a4fc05be88aca5be23f5
+  metadata.gz: 155970f6aff98c1b9f86fe354d17a70fc7b558b7c7805c1c7f6ae65e55a24d13
+  data.tar.gz: bd248c160731f6d98d5547c4cbe2895180a3b2fdec45ab74c7bd608f02e32949
 SHA512:
-  metadata.gz: a91b04513d6ea59199bba52668fd76958ddea756012375db5b567dd67db86874c6ccb2aca08b7ad33480c33683266e417bb455ebeebc5f067de24fa648d3eb7b
-  data.tar.gz: 26458502e1b9c12acf6b9652ce79b35572e28175a105f0fe0dc35eb87584039a47208417d079a5d3a2442e7407cc8b2943d7adbb6bb539bd29d9895063f04140
+  metadata.gz: 311d955094353e8198ce781dda61c6038c2e1b731c48f5de5f7741faeabe6d9e24464d4aa9dc1dd10b897a3beef28a6046501ee59ce771914c3a71add860ff56
+  data.tar.gz: c02b2031484f238b3069f16b3e0f88cd1ac980d67dfdd36fc3aed6cf6fcae8a8ee87bcc0b42da474360abef72e890e4d6acd86c4459e3b27d92a670332d15209

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+.byebug_history

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [v0.2.0] - 2020-01-29
+
+### Added
+
+- `OpenSSL::SignatureAlgorithm::ECDSA#verify` now supports raw (non DER) signatures
+
 ## [v0.1.1] - 2020-01-29
 
 ### Fixed
@@ -14,5 +20,6 @@
 - `OpenSSL::SignatureAlgorithm::RSAPSS`
 - `OpenSSL::SignatureAlgorithm::RSAPKCS1`
 
+[v0.2.0]: https://github.com/cedarcode/openssl-signature_algorithm/compare/v0.1.1...v0.2.0/
 [v0.1.1]: https://github.com/cedarcode/openssl-signature_algorithm/compare/v0.1.0...v0.1.1/
 [v0.1.0]: https://github.com/cedarcode/openssl-signature_algorithm/compare/41887c277dc7fa0c884ccf8924cf990ff76784d9...v0.1.0/

data/Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in openssl-signature_algorithm.gemspec
 gemspec
 
+gem "byebug", "~> 11.0"
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
 gem "rubocop", "~> 0.79.0"

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    openssl-signature_algorithm (0.1.1)
+    openssl-signature_algorithm (0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    byebug (11.1.1)
     diff-lcs (1.3)
     jaro_winkler (1.5.4)
     parallel (1.19.1)
@@ -41,6 +42,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug (~> 11.0)
   openssl-signature_algorithm!
   rake (~> 12.0)
   rspec (~> 3.0)

data/lib/openssl/signature_algorithm/base.rb

@@ -22,7 +22,14 @@ module OpenSSL
       end
 
       def verify(signature, verification_data)
-        verify_key.verify(hash_function, signature, verification_data) ||
+        formatted_signature =
+          if respond_to?(:formatted_signature, true)
+            formatted_signature(signature)
+          else
+            signature
+          end
+
+        verify_key.verify(hash_function, formatted_signature, verification_data) ||
           raise(OpenSSL::SignatureAlgorithm::Error, "Signature verification failed")
       end
     end

data/lib/openssl/signature_algorithm/ecdsa.rb

@@ -6,6 +6,8 @@ require "openssl/signature_algorithm/base"
 module OpenSSL
   module SignatureAlgorithm
     class ECDSA < Base
+      BYTE_LENGTH = 8
+
       class SigningKey < OpenSSL::PKey::EC
         def initialize(*args)
           super(*args).generate_key
@@ -39,6 +41,29 @@ module OpenSSL
         CURVE_BY_DIGEST_LENGTH[digest_length] ||
           raise(OpenSSL::SignatureAlgorithm::Error, "Unsupported digest length #{digest_length}")
       end
+
+      private
+
+      # Borrowed from jwt rubygem.
+      # https://github.com/jwt/ruby-jwt/blob/7a6a3f1dbaff806993156d1dff9c217bb2523ff8/lib/jwt/security_utils.rb#L34-L39
+      #
+      # Hopefully this will be provided by openssl rubygem in the future.
+      def formatted_signature(signature)
+        n = (verify_key_length.to_f / BYTE_LENGTH).ceil
+
+        if signature.size == n * 2
+          r = signature[0..(n - 1)]
+          s = signature[n..-1]
+
+          OpenSSL::ASN1::Sequence.new([r, s].map { |int| OpenSSL::ASN1::Integer.new(OpenSSL::BN.new(int, 2)) }).to_der
+        else
+          signature
+        end
+      end
+
+      def verify_key_length
+        verify_key.group.degree
+      end
     end
   end
 end

data/lib/openssl/signature_algorithm/version.rb

@@ -2,6 +2,6 @@
 
 module OpenSSL
   module SignatureAlgorithm
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openssl-signature_algorithm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Gonzalo