net-ssh 6.0.2 → 6.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64788ad9e1631653585c4f6c15ba5f9f75f3c7094c7514e846b2903033ab63b7
-  data.tar.gz: abe406f28126935bcae76b9d83318164da56128482541cf60807628a91470481
+  metadata.gz: cf912b700a6c4b41e9d530a1a932c2a57d068aed0993dd08144adcaa62db0e8c
+  data.tar.gz: a398bdf7e000b83dc6af0ce26627b8cec722848801856a52d5eb1fb7c1b9afbd
 SHA512:
-  metadata.gz: '092f1301f068486c0db17fb8b58ba1d9453298c083a0b76fa5eae8c9863b5b6270dd7d805642a00e63d87ccb11220f7b1fe5acdbbbf6b46fe6f4e3c45aea7727'
-  data.tar.gz: bb3a8b5ffc952940dce240422f5354dced264b25cb84a0072e44b7068cc1d05da1f14e19a290b0f956bde35f6560021cddf67485bbb242bb6c9f701220287325
+  metadata.gz: a60f408a5f714110cf421a20d35259f9360bd09ead3fcedd20e94b06b889de612522fb0717ef7b0004cc005da6820264b6f08f4ec896704bbd04c3297f943b2e
+  data.tar.gz: e71dca973d3ba3e8d6aed1da493e38de77d7ec7575ea3373aeecfc67b23d73f8cc2a24b731c6d3fb718cf13a1b701a8091be07221b686af945ed1372518d1c0e

data.tar.gz.sig

@@ -1 +1,2 @@
-q/q�Ι��2�L�%���7\+Es�ٛ5�
=v��X���1�G�,v�����%�q,������̊�p�]tZ,S7o.O �$ȴldb��4`�^�d}�������|pdl��M.�N}���Ns{��f�%���i|���V3�-�+�a�r,��0]�@e'���u���6V�3�Ӻ���}�3���o'�deo7^K6�7�~̽�Qxa+|m��3�hy����Kb�G;��8��q�|<�k��/5��
+5�i���$C�M;��7�#�Sl	L�gQ�0����,��b�\�w+�[��
+��4�_���W�k�����ƴ]B����t�HJ��¨/+��&v?�V�
U��w�njw �	�Ny!�E�~�:�m%�EQ�3�ʰ��~ i�z�_��oD�|s+������7Fl�Rq�e+��ze�B�Ë��C�T3���6{�=�m��=�V��*�M�.�`

data/CHANGES.txt

@@ -1,3 +1,8 @@
+=== 6.1.0.rc1
+
+  * Make sha2-{256,512}-etm@openssh.com MAC default again [#761]
+  * Support algorithm subtraction syntax from ssh_config [#751]
+
 === 6.0.2
 
   * Fix corrupted hmac issue in etm hmac [#759]
@@ -12,7 +17,7 @@
   * 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/README.md

@@ -33,7 +33,7 @@ We strongly recommend that you install a servers's version that supports the lat
 
 It is possible to return to the previous behavior by adding the option : `append_all_supported_algorithms: true`
 
-Unsecure algoritms will be definively remove in Net::SSH 7.*.
+Unsecure algoritms will definitely be removed in Net::SSH 7.*.
 
 ### Host Keys
 
@@ -63,7 +63,7 @@ Unsecure algoritms will be definively remove in Net::SSH 7.*.
 
 | Name                                 | Support               | Details  |
 |--------------------------------------|-----------------------|----------|
-| aes256-ctr / aes192-ctr / aes128-ctr | OK                    | [using weak elliptic curves](https://safecurves.cr.yp.to/) |
+| aes256-ctr / aes192-ctr / aes128-ctr | OK                    |          |
 | aes256-cbc / aes192-cbc / aes128-cbc | Deprecated in 6.0     | unsecure, will be removed in 7.0 |
 | rijndael-cbc@lysator.liu.se          | Deprecated in 6.0     | unsecure, will be removed in 7.0 |
 | blowfish-ctr blowfish-cbc            | Deprecated in 6.0     | unsecure, will be removed in 7.0 |
@@ -97,6 +97,7 @@ In a nutshell:
 require 'net/ssh'
 
 Net::SSH.start('host', 'user', password: "password") do |ssh|
+
 # capture all stderr and stdout output from a remote process
 output = ssh.exec!("hostname")
 puts output
@@ -104,7 +105,7 @@ puts output
 # capture only stdout matching a particular pattern
 stdout = ""
 ssh.exec!("ls -l /home/jamis") do |channel, stream, data|
-  stdout << data if stream == :stdout
+  stdout << data if stream == :stdout && /foo/.match(data)
 end
 puts stdout
 
@@ -164,7 +165,7 @@ gem install net-ssh # might need sudo privileges
 ```
 
 NOTE: If you are running on jruby on windows you need to install `jruby-pageant` manually
-(gemspec doesn't allow for platform specific dependencies).
+(gemspec doesn't allow for platform specific dependencies at gem installation time).
 
 However, in order to be sure the code you're installing hasn't been tampered with,
 it's recommended that you verify the [signature](http://docs.rubygems.org/read/chapter/21).

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

@@ -43,7 +43,8 @@ module Net
 
           encryption: %w[aes256-ctr aes192-ctr aes128-ctr],
 
-          hmac: %w[hmac-sha2-512 hmac-sha2-256
+          hmac: %w[hmac-sha2-512-etm@openssh.com hmac-sha2-256-etm@openssh.com
+                   hmac-sha2-512 hmac-sha2-256
                    hmac-sha1]
         }.freeze
 
@@ -83,9 +84,7 @@ module Net
                    hmac-sha1-96
                    hmac-ripemd160 hmac-ripemd160@openssh.com
                    hmac-md5 hmac-md5-96
-                   none] +
-                %w[hmac-sha2-256-etm@openssh.com
-                   hmac-sha2-512-etm@openssh.com],
+                   none],
 
           compression: %w[none zlib@openssh.com zlib],
           language: %w[]
@@ -291,10 +290,24 @@ module Net
           list = []
           option = Array(option).compact.uniq
 
-          if option.first && option.first.start_with?('+')
+          if option.first && option.first.start_with?('+', '-')
             list = supported.dup
-            list << option.first[1..-1]
-            list.concat(option[1..-1])
+
+            appends = option.select { |opt| opt.start_with?('+') }.map { |opt| opt[1..-1] }
+            deletions = option.select { |opt| opt.start_with?('-') }.map { |opt| opt[1..-1] }
+
+            list.concat(appends)
+
+            deletions.each do |opt|
+              if opt.include?('*')
+                opt_escaped = Regexp.escape(opt)
+                algo_re = /\A#{opt_escaped.gsub('\*', '[A-Za-z\d\-@\.]*')}\z/
+                list.delete_if { |existing_opt| algo_re.match(existing_opt) }
+              else
+                list.delete(opt)
+              end
+            end
+
             list.uniq!
           else
             list = option

data/lib/net/ssh/version.rb

@@ -49,14 +49,14 @@ module Net
       MAJOR = 6
 
       # The minor component of this version of the Net::SSH library
-      MINOR = 0
+      MINOR = 1
 
       # The tiny component of this version of the Net::SSH library
-      TINY  = 2
+      TINY  = 0
 
       # The prerelease component of this version of the Net::SSH library
       # nil allowed
-      PRE   = nil
+      PRE   = "rc1"
 
       # The current version of the Net::SSH library as a Version instance
       CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-ssh
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.1.0.rc1
 platform: ruby
 authors:
 - Jamis Buck
@@ -279,9 +279,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: