net-ssh 7.3.6 → 8.0.0.beta3

data/lib/net/ssh/proxy/command.rb

@@ -16,11 +16,6 @@ module Net
       #     ...
       #   end
       class Command
-        # The command line is run by the shell, so like OpenSSH 9.6 (CVE-2023-51385) we refuse
-        # host and user names containing shell metacharacters rather than substituting them.
-        INVALID_HOST_NAME = /\A-|[[:space:][:cntrl:]'`"$\\;&<>|(){},]/.freeze
-        INVALID_USER_NAME = /\A-|[[:cntrl:]'`";&<>|(){}]|[[:space:]]-|\\\z/.freeze
-
         # The command line template
         attr_reader :command_line_template
 
@@ -46,13 +41,13 @@ module Net
           command_line = @command_line_template.gsub(/%(.)/) {
             case $1
             when 'h'
-              validate_host_name!(host)
+              host
             when 'p'
-              validate_port!(port)
+              port.to_s
             when 'r'
               remote_user = connection_options && connection_options[:remote_user]
               if remote_user
-                validate_user_name!(remote_user)
+                remote_user
               else
                 raise ArgumentError, "remote user name not available"
               end
@@ -122,26 +117,6 @@ module Net
           Process.kill('TERM', io.pid)
           Thread.new { io.close }
         end
-
-        private
-
-        def validate_host_name!(host)
-          raise ArgumentError, "host name contains invalid characters: #{host.inspect}" if host.to_s.match?(INVALID_HOST_NAME)
-
-          host
-        end
-
-        def validate_user_name!(user)
-          raise ArgumentError, "user name contains invalid characters: #{user.inspect}" if user.to_s.match?(INVALID_USER_NAME)
-
-          user
-        end
-
-        def validate_port!(port)
-          raise ArgumentError, "port is not a number: #{port.inspect}" unless port.to_s.match?(/\A\d+\z/)
-
-          port.to_s
-        end
       end
     end
   end

data/lib/net/ssh/proxy/jump.rb

@@ -1,4 +1,3 @@
-require 'shellwords'
 require 'uri'
 require 'net/ssh/proxy/command'
 
@@ -35,29 +34,20 @@ module Net
         # We cannot build the ProxyCommand template until we know if the :config
         # option was specified during `Net::SSH.start`.
         def build_proxy_command_equivalent(connection_options = nil)
-          extra_jumps = jump_proxies.split(",", 2)[1]
+          first_jump, extra_jumps = jump_proxies.split(",", 2)
           config = connection_options && connection_options[:config]
-          uri, = jump_proxies.split(",").map { |jump| validate_jump!(jump) }
+          uri = URI.parse("ssh://#{first_jump}")
 
           template = "ssh".dup
           template << " -l #{uri.user}"    if uri.user
           template << " -p #{uri.port}"    if uri.port
           template << " -J #{extra_jumps}" if extra_jumps
-          template << " -F #{Shellwords.escape(config)}" if config != true && config
+          template << " -F #{config}" if config != true && config
           template << " -W %h:%p "
           template << uri.host
 
           @command_line_template = template
         end
-
-        private
-
-        def validate_jump!(jump)
-          uri = URI.parse("ssh://#{jump}")
-          validate_user_name!(uri.user) if uri.user
-          validate_host_name!(uri.host)
-          uri
-        end
       end
     end
   end

data/lib/net/ssh/service/forward.rb

@@ -405,12 +405,6 @@ module Net
 
         # The callback used when an auth-agent channel is requested by the server.
         def auth_agent_channel(session, channel, packet)
-          # Like OpenSSH, only relay the local agent when forwarding was requested (GHSA-qpg5-fx6p-8cq3).
-          unless session.options[:forward_agent] || @agent_forwarded
-            error { "server tried agent forwarding, which was not requested; refusing" }
-            raise Net::SSH::ChannelOpenFailed.new(1, "agent forwarding was not requested")
-          end
-
           info { "opening auth-agent channel" }
           channel[:invisible] = true
 

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

@@ -1,4 +1,4 @@
-require 'rbnacl'
+require 'openssl'
 require 'net/ssh/loggable'
 
 module Net
@@ -8,6 +8,15 @@ module Net
       class ChaCha20Poly1305Cipher
         include Net::SSH::Loggable
 
+        POLY1305_ALGORITHM = "POLY1305"
+        POLY1305_KEY_BYTES = 32
+        POLY1305_TAG_BYTES = 16
+        NAME = "chacha20-poly1305@openssh.com"
+        ZERO_BLOCK = "\x00".b * POLY1305_KEY_BYTES
+        ZERO_IV = "\x00".b * 16
+
+        class UnsupportedError < StandardError; end
+
         # Implicit HMAC, no need to do anything
         class ImplicitHMac
           def etm
@@ -24,7 +33,6 @@ module Net
           @chacha_hdr = OpenSSL::Cipher.new("chacha20")
           key_len = @chacha_hdr.key_len
           @chacha_main = OpenSSL::Cipher.new("chacha20")
-          @poly = RbNaCl::OneTimeAuths::Poly1305
           if key.size < key_len * 2
             error { "chacha20_poly1305: keylength doesn't match" }
             raise "chacha20_poly1305: keylength doesn't match"
@@ -43,9 +51,9 @@ module Net
         end
 
         def update_cipher_mac(payload, sequence_number)
-          iv_data = [0, 0, 0, sequence_number].pack("NNNN")
+          iv_data = packet_iv(sequence_number)
           @chacha_main.iv = iv_data
-          poly_key = @chacha_main.update(([0] * 32).pack('C32'))
+          poly_key = @chacha_main.update(ZERO_BLOCK)
 
           packet_length = payload.size
           length_data = [packet_length].pack("N")
@@ -57,35 +65,36 @@ module Net
           unencrypted_data = payload
           packet += @chacha_main.update(unencrypted_data)
 
-          packet += @poly.auth(poly_key, packet)
+          packet += self.class.poly1305_auth(poly_key, packet)
           return packet
         end
 
         def read_length(data, sequence_number)
-          iv_data = [0, 0, 0, sequence_number].pack("NNNN")
+          iv_data = packet_iv(sequence_number)
           @chacha_hdr.iv = iv_data
           @chacha_hdr.update(data).unpack1("N")
         end
 
         def read_and_mac(data, mac, sequence_number)
-          iv_data = [0, 0, 0, sequence_number].pack("NNNN")
+          iv_data = packet_iv(sequence_number)
           @chacha_main.iv = iv_data
-          poly_key = @chacha_main.update(([0] * 32).pack('C32'))
+          poly_key = @chacha_main.update(ZERO_BLOCK)
 
           iv_data[0] = 1.chr
           @chacha_main.iv = iv_data
           unencrypted_data = @chacha_main.update(data[4..])
-          begin
-            ok = @poly.verify(poly_key, mac, data[0..])
-            raise Net::SSH::Exception, "corrupted hmac detected #{name}" unless ok
-          rescue RbNaCl::BadAuthenticatorError
-            raise Net::SSH::Exception, "corrupted hmac detected #{name}"
-          end
+
+          expected_mac = self.class.poly1305_auth(poly_key, data[0..])
+          valid_mac = mac.respond_to?(:bytesize) &&
+                      mac.bytesize == POLY1305_TAG_BYTES &&
+                      OpenSSL.fixed_length_secure_compare(expected_mac, mac)
+          raise Net::SSH::Exception, "corrupted hmac detected #{name}" unless valid_mac
+
           return unencrypted_data
         end
 
         def mac_length
-          16
+          POLY1305_TAG_BYTES
         end
 
         def block_size
@@ -93,7 +102,7 @@ module Net
         end
 
         def name
-          "chacha20-poly1305@openssh.com"
+          NAME
         end
 
         def implicit_mac?
@@ -111,6 +120,70 @@ module Net
         def self.key_length
           64
         end
+
+        def self.iv_len
+          0
+        end
+
+        def self.auth_length
+          POLY1305_TAG_BYTES
+        end
+
+        def self.decrypt_private_key(ciphertext, auth_tag, key, _initialization_vector)
+          raise ArgumentError, "chacha20_poly1305: keylength doesn't match" unless
+            key.respond_to?(:bytesize) && key.bytesize == key_length
+
+          ciphertext = binary_string(ciphertext)
+          chacha = OpenSSL::Cipher.new("chacha20")
+          chacha.decrypt
+          chacha.key = binary_string(key[0...POLY1305_KEY_BYTES])
+
+          iv_data = ZERO_IV.dup
+          chacha.iv = iv_data
+          poly_key = chacha.update(ZERO_BLOCK)
+
+          valid_mac = OpenSSL.fixed_length_secure_compare(poly1305_auth(poly_key, ciphertext), auth_tag)
+          raise Net::SSH::Exception, "corrupted hmac detected #{NAME}" unless valid_mac
+
+          iv_data.setbyte(0, 1)
+          chacha.iv = iv_data
+          chacha.update(ciphertext)
+        end
+
+        def self.ensure_supported!
+          raise UnsupportedError, "OpenSSL::PKey raw private key APIs are unavailable" unless OpenSSL::PKey.respond_to?(:new_raw_private_key)
+
+          OpenSSL::Cipher.new("chacha20")
+
+          tag = poly1305_auth("\x00" * POLY1305_KEY_BYTES, "")
+          raise UnsupportedError, "OpenSSL Poly1305 authentication failed" unless tag.bytesize == POLY1305_TAG_BYTES
+        rescue OpenSSL::Cipher::CipherError, OpenSSL::PKey::PKeyError => e
+          raise UnsupportedError, e.message
+        end
+
+        def self.poly1305_auth(poly_key, data)
+          validate_poly1305_key!(poly_key)
+          OpenSSL::PKey.new_raw_private_key(POLY1305_ALGORITHM, binary_string(poly_key)).sign(nil, binary_string(data))
+        end
+
+        def self.validate_poly1305_key!(poly_key)
+          raise ArgumentError, "invalid Poly1305 key" unless poly_key.respond_to?(:bytesize) && poly_key.bytesize == POLY1305_KEY_BYTES
+        end
+
+        def self.binary_string(string)
+          string.dup.force_encoding('BINARY')
+        end
+        private_class_method :binary_string
+
+        def packet_iv(sequence_number)
+          iv_data = ZERO_IV.dup
+          iv_data.setbyte(12, (sequence_number >> 24) & 0xff)
+          iv_data.setbyte(13, (sequence_number >> 16) & 0xff)
+          iv_data.setbyte(14, (sequence_number >> 8) & 0xff)
+          iv_data.setbyte(15, sequence_number & 0xff)
+          iv_data
+        end
+        private :packet_iv
       end
     end
   end

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

@@ -1,15 +1,34 @@
 module Net
   module SSH
     module Transport
-      # Loads chacha20 poly1305 support which requires optinal dependency rbnacl
+      # Loads chacha20-poly1305 support backed by Ruby OpenSSL APIs.
       module ChaCha20Poly1305CipherLoader
         begin
           require 'net/ssh/transport/chacha20_poly1305_cipher'
+          Net::SSH::Transport::ChaCha20Poly1305Cipher.ensure_supported!
           LOADED = true
           ERROR = nil
         rescue LoadError => e
           ERROR = e
           LOADED = false
+        rescue StandardError => e
+          if defined?(Net::SSH::Transport::ChaCha20Poly1305Cipher::UnsupportedError) &&
+             e.is_a?(Net::SSH::Transport::ChaCha20Poly1305Cipher::UnsupportedError)
+            ERROR = e
+            LOADED = false
+          else
+            raise
+          end
+        end
+
+        def self.raiseUnlessLoaded(message)
+          description = LOADED ? '' : chacha20_poly1305_support_required
+          description += "#{ERROR.class} : \"#{ERROR.message}\"\n" if ERROR
+          raise NotImplementedError, "#{message}\n#{description}" unless LOADED
+        end
+
+        def self.chacha20_poly1305_support_required
+          "net-ssh requires openssl >= 3.2.0 and a crypto backend with ChaCha20 and Poly1305 enabled for chacha20-poly1305@openssh.com support.\n"
         end
       end
     end

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,7 +211,6 @@ module Net
 
             else
               return packet if algorithms.allow?(packet)
-              raise Net::SSH::Exception, "unexpected packet type #{packet.type} during initial key exchange" unless algorithms.initialized?
 
               push(packet)
             end
@@ -240,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
 
@@ -287,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.