ssh_data 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d17ebf6c761d5e15b35c4fe273dd0431b327c41456e36971c402763a5ddcdfa
-  data.tar.gz: c48ac30c8c9d53b022b8f06bfe5deaf8a16954f2fcdc91cfd3178fbd6804cc88
+  metadata.gz: a33f8e3096dba56186df0bf3288d36c0fda79f75d7a02e6a58c585b468d4cd76
+  data.tar.gz: 3f5f652b61e4fbbb06bc24154c51683e97be194a70565d993ee27ff87ec8eb2f
 SHA512:
-  metadata.gz: c262a0c7c00ebab56b9c302625b3de59ced3b140e362c96cfddc4fb7d150d0d6515eab600177cb18b068a526b4e5d72314508a0ceec7bd89422321c85289dfbb
-  data.tar.gz: 0b794f39c77676fcbab5c545a7b172c95fd37cd72048d9eb1d9e5de26efd70e971ab318b32fa428752e364e1f24c8afa2841b9d582aab59fc4ea66abb396123a
+  metadata.gz: b6b1324539e847dd7e7d858cd0f64a8c369de781bdb8f5fcde7667ad9a61748e347209f7d6f06f7e5400d9147e67a9289f6f99aa187ec368bfc4a38ddccc22b9
+  data.tar.gz: 7c1a063701138b853aebff7adb7f7a9d8bccabdf04d58d81dffb16ab2a499706401355ac01f2f4e8e91789140fd051569ecf8056eae27a76d0ae1425128e62c7

data/lib/ssh_data/encoding.rb

@@ -424,7 +424,7 @@ module SSHData
       [hash, total_read]
     end
 
-    # Encode the series of fiends into a binary string.
+    # Encode the series of fields into a binary string.
     #
     # fields - A series of Arrays, each containing a Symbol type and a value to
     #          encode.

data/lib/ssh_data/private_key/ecdsa.rb

@@ -13,7 +13,7 @@ module SSHData
         openssl_curve = PublicKey::ECDSA::OPENSSL_CURVE_NAME_FOR_CURVE[curve]
         raise AlgorithmError, "unknown curve: #{curve}" if openssl_curve.nil?
 
-        openssl_key = OpenSSL::PKey::EC.new(openssl_curve).tap(&:generate_key)
+        openssl_key = OpenSSL::PKey::EC.generate(openssl_curve)
         from_openssl(openssl_key)
       end
 

data/lib/ssh_data/private_key/rsa.rb

@@ -21,9 +21,9 @@ module SSHData
 
       # Import an openssl private key.
       #
-      # key - An OpenSSL::PKey::DSA instance.
+      # key - An OpenSSL::PKey::RSA instance.
       #
-      # Returns a DSA instance.
+      # Returns a RSA instance.
       def self.from_openssl(key)
         new(
           algo: PublicKey::ALGO_RSA,

data/lib/ssh_data/public_key/dsa.rb

@@ -67,7 +67,7 @@ module SSHData
       # Verify an SSH signature.
       #
       # signed_data - The String message that the signature was calculated over.
-      # signature   - The binarty String signature with SSH encoding.
+      # signature   - The binary String signature with SSH encoding.
       #
       # Returns boolean.
       def verify(signed_data, signature)

data/lib/ssh_data/public_key/ecdsa.rb

@@ -93,7 +93,7 @@ module SSHData
       # Verify an SSH signature.
       #
       # signed_data - The String message that the signature was calculated over.
-      # signature   - The binarty String signature with SSH encoding.
+      # signature   - The binary String signature with SSH encoding.
       #
       # Returns boolean.
       def verify(signed_data, signature)

data/lib/ssh_data/public_key/ed25519.rb

@@ -37,7 +37,7 @@ module SSHData
       # Verify an SSH signature.
       #
       # signed_data - The String message that the signature was calculated over.
-      # signature   - The binarty String signature with SSH encoding.
+      # signature   - The binary String signature with SSH encoding.
       #
       # Returns boolean.
       def verify(signed_data, signature)

data/lib/ssh_data/public_key/rsa.rb

@@ -26,7 +26,7 @@ module SSHData
       # Verify an SSH signature.
       #
       # signed_data - The String message that the signature was calculated over.
-      # signature   - The binarty String signature with SSH encoding.
+      # signature   - The binary String signature with SSH encoding.
       #
       # Returns boolean.
       def verify(signed_data, signature)
@@ -37,6 +37,12 @@ module SSHData
           raise DecodeError, "bad signature algorithm: #{sig_algo.inspect}"
         end
 
+        # OpenSSH compatibility: if a the number of bytes in the signature is less than the number of bytes of the RSA
+        # modulus, prepend the signature with zeros.
+        # See https://github.com/openssh/openssh-portable/blob/ac383f3a5c6f529a2e8a5bc44af79a08c7da294e/ssh-rsa.c#L531
+        difference = n.num_bytes - raw_sig.bytesize
+        raw_sig = "\0" * difference + raw_sig if difference.positive?
+
         openssl.verify(digest.new, raw_sig, signed_data)
       end
 

data/lib/ssh_data/signature.rb

@@ -108,6 +108,10 @@ module SSHData
     # If the signature was created from a certificate, this will be an
     # SSHData::Certificate. Otherwise, this will be a PublicKey algorithm.
     def public_key
+      @data_public_key ||= load_public_key
+    end
+
+    private def load_public_key
       public_key_algorithm, _ = Encoding.decode_string(@publickey)
 
       if PublicKey::ALGOS.include?(public_key_algorithm)

data/lib/ssh_data/version.rb

@@ -1,3 +1,3 @@
 module SSHData
-  VERSION = "1.3.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: ssh_data
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - mastahyeti
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: ed25519
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +65,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rspec-parameterized
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +93,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
-description:
 email: opensource+ssh_data@github.com
 executables: []
 extensions: []
@@ -98,7 +124,6 @@ homepage: https://github.com/github/ssh_data
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,15 +131,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Library for parsing SSH certificates
 test_files: []