net-ssh 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963b93f32673d9b553ebc06129b1882e11c4462ab271625cc086e5a6bb8094d5
-  data.tar.gz: 289abcb23e1e051acd2be9e96818d7044baaea9df09098fdeaef4db58e18a430
+  metadata.gz: 4cc1432c4de3e73664584e030b5afdb9d2f48518de8e56f275a1550c4bce6834
+  data.tar.gz: c6212df63e3018f8f97cd231101e7b1754fe6fdc5ff4970704069ebf40c9f62c
 SHA512:
-  metadata.gz: 463991f4ec08d77186bfb197d65ab9359241cc82287ec4ee166176662683b3b6bf451dfa49bada27096769c953ce39d594dc6ae23d0c3b9645708ce5bf4a58f0
-  data.tar.gz: f1d75930f1337e95992049d5c302a9c6a95084a2c61f8feb9fff4aec48f17eb5ceb02eb48cb4458d09047d9d216f39ac78825ce7bc222eb9a0dd665d6f3e85b2
+  metadata.gz: 2c44edd812bb538f3ef63491e413c4750d2745a3cc13075dab44e7a86fcd5326b072c908fb84d374bfa56cb06d033e2e83462774b0500a7046ce7d523e980e0f
+  data.tar.gz: acd87825d5584f0751595d94020d8aa99f9096deb6015285c1e3376c8957cb88335b3892e76d3af0354031b471f7de90f4ee55e64ac9197db017b0724deba2c3

data/CHANGES.txt

@@ -1,5 +1,14 @@
+=== 6.0.1
+
+  * Make sha2-{256,512}-etm@openssh.com MAC opt-in as they seems to have issues [#757]
+
+=== 6.0.0
+
+  * Support empty lines and comments in known_hosts [donoghuc, #742]
+  * Add sha2-{256,512}-etm@openssh.com MAC algorithms [graaff, #714]
+
 === 6.0.0 beta2
-  
+
   * Support :certkeys and CertificateFile configuration option  [Anders Carling, #722]
 
 === 6.0.0 beta1

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

@@ -43,8 +43,7 @@ module Net
 
           encryption: %w[aes256-ctr aes192-ctr aes128-ctr],
 
-          hmac: %w[hmac-sha2-512-etm@openssh.com hmac-sha2-256-etm@openssh.com
-                   hmac-sha2-512 hmac-sha2-256
+          hmac: %w[hmac-sha2-512 hmac-sha2-256
                    hmac-sha1]
         }.freeze
 
@@ -84,7 +83,9 @@ module Net
                    hmac-sha1-96
                    hmac-ripemd160 hmac-ripemd160@openssh.com
                    hmac-md5 hmac-md5-96
-                   none],
+                   none] +
+                %w[hmac-sha2-256-etm@openssh.com
+                   hmac-sha2-512-etm@openssh.com],
 
           compression: %w[none zlib@openssh.com zlib],
           language: %w[]

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

@@ -215,6 +215,7 @@ module Net
         # read, post-processed according to the cipher, hmac, and compression
         # algorithms specified in the server state object, and returned as a
         # new Packet object.
+        # rubocop:disable Metrics/AbcSize
         def poll_next_packet
           aad_length = server.hmac.etm ? 4 : 0
 
@@ -260,7 +261,7 @@ module Net
                              else
                                server.hmac.digest([server.sequence_number, @packet.content].pack("NA*"))
                              end
-          raise Net::SSH::Exception, "corrupted hmac detected" if real_hmac != my_computed_hmac
+          raise Net::SSH::Exception, "corrupted hmac detected #{server.hmac.class}" if real_hmac != my_computed_hmac
 
           # try to decompress the payload, in case compression is active
           payload = server.decompress(payload)
@@ -273,6 +274,7 @@ module Net
           return Packet.new(payload)
         end
       end
+      # rubocop:enable Metrics/AbcSize
 
     end
   end

data/lib/net/ssh/version.rb

@@ -52,7 +52,7 @@ module Net
       MINOR = 0
 
       # The tiny component of this version of the Net::SSH library
-      TINY  = 0
+      TINY  = 1
 
       # The prerelease component of this version of the Net::SSH library
       # nil allowed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Jamis Buck
@@ -31,7 +31,7 @@ cert_chain:
   voajiJNS75Pw/2j13WnPB4Q6w7dHSb57E/VluBpVKmcQZN0dGdAkEIVty3v7kw9g
   y++VpCpWM/PstIFv4ApZMf501UY=
   -----END CERTIFICATE-----
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf