net-ssh 7.3.10 → 8.0.0.beta3

data/lib/net/ssh/transport/cipher_factory.rb

@@ -100,7 +100,11 @@ module Net
         # if :iv_len option is supplied the third return value will be ivlen
         def self.get_lengths(name, options = {})
           klass = SSH_TO_CLASS[name]
-          return [klass.key_length, klass.block_size] unless klass.nil?
+          unless klass.nil?
+            result = [klass.key_length, klass.block_size]
+            result << klass.iv_len if options[:iv_len]
+            return result
+          end
 
           ossl_name = SSH_TO_OSSL[name]
           if ossl_name.nil? || ossl_name == "none"
@@ -124,6 +128,24 @@ module Net
           end
           result
         end
+
+        def self.auth_length(name)
+          klass = SSH_TO_CLASS[name]
+          return klass.auth_length if klass.respond_to?(:auth_length)
+
+          0
+        end
+
+        def self.decrypt_private_key(name, ciphertext, auth_tag, key, initialization_vector)
+          klass = SSH_TO_CLASS[name]
+          raise Net::SSH::Exception, "#{name} does not support private key decryption" unless
+            klass.respond_to?(:decrypt_private_key)
+
+          raise Net::SSH::Exception, "incorrect auth_tag length" unless
+            auth_tag.respond_to?(:bytesize) && auth_tag.bytesize == klass.auth_length
+
+          klass.decrypt_private_key(ciphertext, auth_tag, key, initialization_vector)
+        end
       end
     end
   end

data/lib/net/ssh/transport/gcm_cipher.rb

@@ -5,7 +5,11 @@ module Net
     module Transport
       ## Extension module for aes(128|256)gcm ciphers
       module GCMCipher
-        # rubocop:disable Metrics/AbcSize
+        BLOCK_SIZE = 16
+        IV_BYTES = 12
+        AUTH_TAG_BYTES = 16
+
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         def self.extended(orig)
           # rubocop:disable Metrics/BlockLength
           orig.class_eval do
@@ -100,15 +104,32 @@ module Net
             end
 
             def mac_length
-              16
+              GCMCipher::AUTH_TAG_BYTES
             end
 
             def block_size
-              16
+              GCMCipher::BLOCK_SIZE
             end
 
             def self.block_size
-              16
+              GCMCipher::BLOCK_SIZE
+            end
+
+            def self.iv_len
+              GCMCipher::IV_BYTES
+            end
+
+            def self.auth_length
+              GCMCipher::AUTH_TAG_BYTES
+            end
+
+            def self.decrypt_private_key(ciphertext, auth_tag, key, initialization_vector)
+              cipher = new(encrypt: false, key: key)
+
+              cipher.nonce = initialization_vector
+              cipher.cipher.auth_tag = auth_tag.to_s
+              cipher.cipher.auth_data = ''
+              cipher.cipher.update(ciphertext.to_s) << cipher.cipher.final
             end
 
             #
@@ -117,7 +138,7 @@ module Net
             # N_MAX       maximum nonce (IV) length        12 octets
             #
             def iv_len
-              12
+              GCMCipher::IV_BYTES
             end
 
             #
@@ -201,7 +222,7 @@ module Net
         end
         # rubocop:enable Metrics/BlockLength
       end
-      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end
   end
 end

data/lib/net/ssh/transport/kex/curve25519_sha256.rb

@@ -1,7 +1,4 @@
-gem 'x25519' # raise if the gem x25519 is not installed
-
-require 'x25519'
-
+require 'openssl'
 require 'net/ssh/transport/constants'
 require 'net/ssh/transport/kex/abstract5656'
 
@@ -12,25 +9,60 @@ module Net
         # A key-exchange service implementing the "curve25519-sha256@libssh.org"
         # key-exchange algorithm. (defined in https://tools.ietf.org/html/draft-ietf-curdle-ssh-curves-06)
         class Curve25519Sha256 < Abstract5656
+          ALGORITHM = "X25519"
+          KEY_BYTES = 32
+
+          class UnsupportedError < StandardError; end
+
+          def self.ensure_supported!
+            unless OpenSSL::PKey.respond_to?(:generate_key) && OpenSSL::PKey.respond_to?(:new_raw_public_key)
+              raise UnsupportedError, "OpenSSL::PKey raw public key APIs are unavailable"
+            end
+
+            key = generate_x25519_key
+            public_key = new_raw_public_key(key.raw_public_key)
+            validate_key_bytes!(key.derive(public_key), "shared secret", KEY_BYTES)
+          rescue OpenSSL::PKey::PKeyError => e
+            raise UnsupportedError, e.message
+          end
+
+          def self.generate_x25519_key
+            OpenSSL::PKey.generate_key(ALGORITHM)
+          end
+
+          def self.new_raw_public_key(key)
+            validate_key_bytes!(key, "public key", KEY_BYTES)
+            OpenSSL::PKey.new_raw_public_key(ALGORITHM, binary_string(key))
+          end
+
+          def self.validate_key_bytes!(key, label, expected_bytes)
+            raise ArgumentError, "invalid X25519 #{label}" unless key.respond_to?(:bytesize) && key.bytesize == expected_bytes
+          end
+
+          def self.binary_string(string)
+            string.dup.force_encoding('BINARY')
+          end
+          private_class_method :binary_string
+
           def digester
             OpenSSL::Digest::SHA256
           end
 
           private
 
-          def generate_key # :nodoc:
-            ::X25519::Scalar.generate
+          def generate_key
+            self.class.generate_x25519_key
           end
 
           ## string   Q_C, client's ephemeral public key octet string
           def ecdh_public_key_bytes
-            ecdh.public_key.to_bytes
+            ecdh.raw_public_key
           end
 
           # compute shared secret from server's public key and client's private key
           def compute_shared_secret(server_ecdh_pubkey)
-            pk = ::X25519::MontgomeryU.new(server_ecdh_pubkey)
-            OpenSSL::BN.new(ecdh.diffie_hellman(pk).to_bytes, 2)
+            pk = self.class.new_raw_public_key(server_ecdh_pubkey)
+            OpenSSL::BN.new(ecdh.derive(pk), 2)
           end
         end
       end

data/lib/net/ssh/transport/kex/curve25519_sha256_loader.rb

@@ -2,26 +2,34 @@ module Net
   module SSH
     module Transport
       module Kex
-        # Loads Curve25519Sha256 support which requires optinal dependencies
+        # Loads Curve25519Sha256 support backed by Ruby OpenSSL X25519 APIs.
         module Curve25519Sha256Loader
           begin
             require 'net/ssh/transport/kex/curve25519_sha256'
+            Net::SSH::Transport::Kex::Curve25519Sha256.ensure_supported!
             LOADED = true
             ERROR = nil
           rescue LoadError => e
             ERROR = e
             LOADED = false
+          rescue StandardError => e
+            if defined?(Net::SSH::Transport::Kex::Curve25519Sha256::UnsupportedError) &&
+               e.is_a?(Net::SSH::Transport::Kex::Curve25519Sha256::UnsupportedError)
+              ERROR = e
+              LOADED = false
+            else
+              raise
+            end
           end
 
           def self.raiseUnlessLoaded(message)
-            description = ERROR.is_a?(LoadError) ? dependenciesRequiredForX25519 : ''
-            description << "#{ERROR.class} : \"#{ERROR.message}\"\n" if ERROR
+            description = LOADED ? '' : x25519SupportRequired
+            description += "#{ERROR.class} : \"#{ERROR.message}\"\n" if ERROR
             raise NotImplementedError, "#{message}\n#{description}" unless LOADED
           end
 
-          def self.dependenciesRequiredForX25519
-            result = "net-ssh requires the following gems for x25519 support:\n"
-            result << " * x25519\n"
+          def self.x25519SupportRequired
+            "net-ssh requires openssl >= 3.2.0 and a crypto backend with X25519 enabled for curve25519-sha256 support.\n"
           end
         end
       end

data/lib/net/ssh/transport/packet_stream.rb

@@ -15,9 +15,6 @@ module Net
       module PacketStream # rubocop:disable Metrics/ModuleLength
         PROXY_COMMAND_HOST_IP = '<no hostip for proxy command>'.freeze
 
-        # Same limit as OpenSSH; a larger length would make us buffer whatever the server streams (GHSA-pfqh-p9vh-wx4p).
-        PACKET_MAX_SIZE = 256 * 1024
-
         include BufferedIo
 
         def self.extended(object)
@@ -243,7 +240,6 @@ module Net
               @packet = Net::SSH::Buffer.new(server.update_cipher(data))
               @packet_length = @packet.read_long
             end
-            raise Net::SSH::Exception, "bad packet length #{@packet_length}" if @packet_length < 5 || @packet_length > PACKET_MAX_SIZE
           end
 
           need = @packet_length + 4 - aad_length - server.block_size

data/lib/net/ssh/transport/server_version.rb

@@ -18,10 +18,6 @@ module Net
         # The SSH version string as reported by Net::SSH
         PROTO_VERSION = "SSH-2.0-Ruby/Net::SSH_#{Net::SSH::Version::CURRENT} #{RUBY_PLATFORM}"
 
-        # Same limits as OpenSSH, so a server can't make us buffer its banner without bound (GHSA-r75w-7fhp-84w8).
-        MAX_LINE_LENGTH = 8192
-        MAX_HEADER_LINES = 1024
-
         # Any header text sent by the server prior to sending the version.
         attr_reader :header
 
@@ -49,15 +45,24 @@ module Net
           socket.write "#{PROTO_VERSION}\r\n"
           socket.flush
 
-          deadline = timeout && (Process.clock_gettime(Process::CLOCK_MONOTONIC) + timeout)
+          raise Net::SSH::ConnectionTimeout, "timeout during server version negotiating" if timeout && !IO.select([socket], nil, nil, timeout)
 
-          MAX_HEADER_LINES.times do
-            @version = read_line(socket, deadline)
+          loop do
+            @version = String.new
+            loop do
+              begin
+                b = socket.readpartial(1)
+                raise Net::SSH::Disconnect, "connection closed by remote host" if b.nil?
+              rescue EOFError
+                raise Net::SSH::Disconnect, "connection closed by remote host"
+              end
+              @version << b
+              break if b == "\n"
+            end
             break if @version.match(/^SSH-/)
 
             @header << @version
           end
-          raise Net::SSH::Exception, "no SSH version received in the first #{MAX_HEADER_LINES} lines" unless @version.match(/^SSH-/)
 
           @version.chomp!
           debug { "remote is `#{@version}'" }
@@ -66,31 +71,6 @@ module Net
 
           raise Net::SSH::ConnectionTimeout, "timeout during client version negotiating" if timeout && !IO.select(nil, [socket], nil, timeout)
         end
-
-        def read_line(socket, deadline)
-          line = String.new
-          loop do
-            wait_readable(socket, deadline)
-            begin
-              b = socket.readpartial(1)
-              raise Net::SSH::Disconnect, "connection closed by remote host" if b.nil?
-            rescue EOFError
-              raise Net::SSH::Disconnect, "connection closed by remote host"
-            end
-            line << b
-            return line if b == "\n"
-            raise Net::SSH::Exception, "server version line exceeds #{MAX_LINE_LENGTH} bytes" if line.bytesize > MAX_LINE_LENGTH
-          end
-        end
-
-        def wait_readable(socket, deadline)
-          return unless deadline
-
-          remaining = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          return if remaining > 0 && IO.select([socket], nil, nil, remaining)
-
-          raise Net::SSH::ConnectionTimeout, "timeout during server version negotiating"
-        end
       end
     end
   end

data/lib/net/ssh/transport/session.rb

@@ -27,10 +27,6 @@ module Net
         # The standard port for the SSH protocol.
         DEFAULT_PORT = 22
 
-        # Packets held back during a re-key are bounded so a server can't exhaust memory (GHSA-ggxh-cfwq-5xqc).
-        MAX_QUEUED_PACKETS = 16_384
-        MAX_QUEUED_BYTES = 32 * 1024 * 1024
-
         # The host to connect to, as given to the constructor.
         attr_reader :host
 
@@ -83,7 +79,6 @@ module Net
           debug { "connection established" }
 
           @queue = []
-          @queued_bytes = 0
 
           @host_key_verifier = select_host_key_verifier(options[:verify_host_key])
 
@@ -193,7 +188,7 @@ module Net
         # read from the queue before the socket is queried.
         def poll_message(mode = :nonblock, consume_queue = true)
           loop do
-            return shift_queue if consume_queue && @queue.any? && algorithms.allow?(@queue.first)
+            return @queue.shift if consume_queue && @queue.any? && algorithms.allow?(@queue.first)
 
             packet = socket.next_packet(mode, options[:timeout])
             return nil if packet.nil?
@@ -216,8 +211,6 @@ module Net
 
             else
               return packet if algorithms.allow?(packet)
-              # Algorithms#rekey! clears initialized?, so the session id is what marks the first key exchange as done.
-              raise Net::SSH::Exception, "unexpected packet type #{packet.type} during initial key exchange" unless algorithms.session_id
 
               push(packet)
             end
@@ -241,11 +234,6 @@ module Net
         # #poll_message will return packets from the queue in the order they
         # were received.
         def push(packet)
-          @queued_bytes += packet.length
-          if @queue.size >= MAX_QUEUED_PACKETS || @queued_bytes > MAX_QUEUED_BYTES
-            raise Net::SSH::Exception, "too many packets queued during key exchange"
-          end
-
           @queue.push(packet)
         end
 
@@ -288,12 +276,6 @@ module Net
 
         private
 
-        def shift_queue
-          packet = @queue.shift
-          @queued_bytes -= packet.length
-          packet
-        end
-
         # Compatibility verifier which allows users to keep using
         # custom verifier code without adding new :verify_signature
         # method.

data/lib/net/ssh/verifiers/accept_new_or_local_tunnel.rb

@@ -7,13 +7,11 @@ module Net
       # verify a connection if the server is the localhost and the port is a
       # nonstandard port number. Those two conditions will typically mean the
       # connection is being tunnelled through a forwarded port, so the known-hosts
-      # file will not be helpful (in general). A key marked @revoked is refused
-      # either way.
+      # file will not be helpful (in general).
       class AcceptNewOrLocalTunnel < AcceptNew
         # Tries to determine if the connection is being tunnelled, and if so,
         # returns true. Otherwise, performs the standard strict verification.
         def verify(arguments)
-          refuse_revoked!(arguments)
           return true if tunnelled?(arguments)
 
           super

data/lib/net/ssh/verifiers/always.rb

@@ -10,13 +10,10 @@ module Net
       # (HostKeyUnknown). This is in contrast to the "Strict" class, which will
       # silently add the key to your known_hosts file. If the server does appear at
       # least once, but the key given does not match any known for the server, an
-      # exception will be raised (HostKeyMismatch). A key marked @revoked in a
-      # host file is always refused (HostKeyRevoked).
+      # exception will be raised (HostKeyMismatch).
       # Otherwise, this returns true.
       class Always
         def verify(arguments)
-          refuse_revoked!(arguments)
-
           host_keys = arguments[:session].host_keys
 
           # We've never seen this host before, so raise an exception.
@@ -50,25 +47,10 @@ module Net
 
         private
 
-        # Custom :known_hosts objects may return a host_keys collection with no
-        # revocation support.
-        def refuse_revoked!(arguments)
-          host_keys = arguments[:session].host_keys
-          return unless host_keys.respond_to?(:revoked?) && host_keys.revoked?(arguments[:key])
-
-          exception = HostKeyRevoked.new("fingerprint #{arguments[:fingerprint]} " +
-                                         "is revoked for #{host_keys.host.inspect}")
-          exception.data = arguments
-          raise exception
-        end
-
         # Enforces the @cert-authority certificate constraints for entries that
         # implement them (Net::SSH::HostKeyEntries::CertAuthority). Non-certificate
         # entries do not respond to these predicates and are left untouched.
         def verify_certificate!(entry, host_keys, arguments)
-          # Plain keys carry no certificate constraints, and respond_to? on this delegator prints a deprecation warning (#1026).
-          return if entry.is_a?(Net::SSH::HostKeyEntries::PubKey)
-
           cert = arguments[:key]
 
           if entry.respond_to?(:matches_validity?) && !entry.matches_validity?(cert)

data/lib/net/ssh/verifiers/never.rb

@@ -3,8 +3,7 @@ module Net
     module Verifiers
       # This host key verifier simply allows every key it sees, without
       # any verification. This is simple, but very insecure because it
-      # exposes you to MiTM attacks. It does not read the known hosts files,
-      # so it accepts keys marked @revoked as well.
+      # exposes you to MiTM attacks.
       class Never
         # Returns true.
         def verify(arguments)

data/lib/net/ssh/version.rb

@@ -46,17 +46,17 @@ module Net
       end
 
       # The major component of this version of the Net::SSH library
-      MAJOR = 7
+      MAJOR = 8
 
       # The minor component of this version of the Net::SSH library
-      MINOR = 3
+      MINOR = 0
 
       # The tiny component of this version of the Net::SSH library
-      TINY  = 10
+      TINY  = 0
 
       # The prerelease component of this version of the Net::SSH library
       # nil allowed
-      PRE   = nil
+      PRE   = "beta3"
 
       # The current version of the Net::SSH library as a Version instance
       CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

data/net-ssh.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.}
   spec.homepage      = "https://github.com/net-ssh/net-ssh"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7")
   spec.metadata = {
     "changelog_uri" => "https://github.com/net-ssh/net-ssh/blob/master/CHANGES.txt"
   }
@@ -30,15 +30,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency("logger")
+  spec.add_dependency("openssl", ">= 3.2.0")
 
-  unless ENV['NET_SSH_NO_ED25519']
-    spec.add_development_dependency("bcrypt_pbkdf", "~> 1.0") unless RUBY_PLATFORM == "java"
-    spec.add_development_dependency("ed25519", "~> 1.2")
-    spec.add_development_dependency('x25519') unless RUBY_PLATFORM == 'java'
-  end
-
-  spec.add_development_dependency('rbnacl', '~> 7.1') unless ENV['NET_SSH_NO_RBNACL']
+  spec.add_development_dependency("bcrypt_pbkdf", "~> 1.0") unless RUBY_PLATFORM == "java"
 
   spec.add_development_dependency "base64"
   spec.add_development_dependency "bundler", ">= 1.17"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 7.3.10
+  version: 8.0.0.beta3
 platform: ruby
 authors:
 - Jamis Buck
@@ -32,22 +32,22 @@ cert_chain:
   ufHf4AX2UIkJbh7zCPkiNCqIr7MSWLNFG/9lOlHYsEJM8XujT1ofPobYx6YSFx/C
   7HBrI7UX7awt6UvBZebhcHzyMHxg/B5PVQllPA==
   -----END CERTIFICATE-----
-date: 2026-11-08 00:00:00.000000000 Z
+date: 2026-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logger
+  name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
@@ -62,48 +62,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: ed25519
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: x25519
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rbnacl
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -228,8 +186,6 @@ files:
 - Dockerfile.openssl3
 - Dockerfile.zlib_ng
 - Gemfile
-- Gemfile.noed25519
-- Gemfile.norbnacl
 - ISSUE_TEMPLATE.md
 - LICENSE.txt
 - Manifest
@@ -352,12 +308,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.3
 signing_key:

data/Gemfile.noed25519

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-ENV['NET_SSH_NO_ED25519'] = 'true'
-# Specify your gem's dependencies in mygem.gemspec
-gemspec
-
-if ENV["CI"] && !Gem.win_platform?
-  gem 'simplecov', require: false, group: :test
-  gem 'codecov', require: false, group: :test
-end
-
-gem 'webrick', group: %i[development test] if RUBY_VERSION.split(".")[0].to_i >= 3

data/Gemfile.norbnacl

@@ -1,12 +0,0 @@
-source 'https://rubygems.org'
-
-ENV['NET_SSH_NO_RBNACL'] = 'true'
-# Specify your gem's dependencies in mygem.gemspec
-gemspec
-
-if ENV["CI"] && !Gem.win_platform?
-  gem 'simplecov', require: false, group: :test
-  gem 'codecov', require: false, group: :test
-end
-
-gem 'webrick', group: %i[development test] if RUBY_VERSION.split(".")[0].to_i >= 3