net-ssh 6.0.0 → 6.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963b93f32673d9b553ebc06129b1882e11c4462ab271625cc086e5a6bb8094d5
-  data.tar.gz: 289abcb23e1e051acd2be9e96818d7044baaea9df09098fdeaef4db58e18a430
+  metadata.gz: 4e74d12e16e132ebfb6235718a438feb6576d1fe59fd858853458d88d5bb5c6f
+  data.tar.gz: 8f403340fb29215a24790d1115bf891eccc1fc1a754181745cb3bbac19d97d88
 SHA512:
-  metadata.gz: 463991f4ec08d77186bfb197d65ab9359241cc82287ec4ee166176662683b3b6bf451dfa49bada27096769c953ce39d594dc6ae23d0c3b9645708ce5bf4a58f0
-  data.tar.gz: f1d75930f1337e95992049d5c302a9c6a95084a2c61f8feb9fff4aec48f17eb5ceb02eb48cb4458d09047d9d216f39ac78825ce7bc222eb9a0dd665d6f3e85b2
+  metadata.gz: e77a53f19272b62fe0fa52d6aea6dc66c68f37b388a79858cb4127a924c616311dc569b18d644bf7aaa96ea7239b0b81836cca4b03621390fd508b7be6540f5a
+  data.tar.gz: 7e1f389d39afbfc159f0f195ae5b8c4232af232123005760b1036e9b5e1b208cab14925f32f60f50396a6865eed603561c70ce80f86d33b2d5a85d24be9845a9

data/.gitignore

@@ -9,3 +9,5 @@ test/integration/.vagrant
 test/integration/playbook.retry
 
 .byebug_history
+
+tryout

data/.rubocop_todo.yml

@@ -1,19 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-09-10 17:13:26 +0200 using RuboCop version 0.74.0.
+# on 2020-05-29 10:37:36 +0200 using RuboCop version 0.74.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 76
+# Offense count: 75
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
 Layout/AlignArguments:
   Enabled: false
 
-# Offense count: 57
+# Offense count: 63
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
@@ -32,39 +32,13 @@ Layout/AlignHash:
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
-# Offense count: 170
+# Offense count: 172
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
 Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Layout/IndentFirstArrayElement:
-  Exclude:
-    - 'lib/net/ssh/transport/openssl.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-Layout/LeadingBlankLines:
-  Exclude:
-    - 'Rakefile'
-    - 'lib/net/ssh/authentication/pub_key_fingerprint.rb'
-    - 'support/arcfour_check.rb'
-
-# Offense count: 14
-# Cop supports --auto-correct.
-# Configuration parameters: AllowDoxygenCommentStyle.
-Layout/LeadingCommentSpace:
-  Exclude:
-    - 'test/integration/test_ed25519_pkeys.rb'
-    - 'test/integration/test_forward.rb'
-    - 'test/integration/test_id_rsa_keys.rb'
-    - 'test/integration/test_proxy.rb'
-
 # Offense count: 23
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, IndentationWidth.
@@ -87,7 +61,7 @@ Layout/SpaceAfterColon:
     - 'test/integration/test_ed25519_pkeys.rb'
     - 'test/verifiers/test_always.rb'
 
-# Offense count: 281
+# Offense count: 291
 # Cop supports --auto-correct.
 Layout/SpaceAfterComma:
   Enabled: false
@@ -99,7 +73,7 @@ Layout/SpaceAfterComma:
 Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
-# Offense count: 10
+# Offense count: 12
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
@@ -122,14 +96,7 @@ Layout/SpaceInsideReferenceBrackets:
   Exclude:
     - 'lib/net/ssh/transport/algorithms.rb'
 
-# Offense count: 17
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingBlankLines:
-  Enabled: false
-
-# Offense count: 739
+# Offense count: 730
 # Cop supports --auto-correct.
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
@@ -177,14 +144,6 @@ Lint/Loop:
     - 'lib/net/ssh/authentication/methods/password.rb'
     - 'lib/net/ssh/key_factory.rb'
 
-# Offense count: 3
-# Configuration parameters: MaximumRangeSize.
-Lint/MissingCopEnableDirective:
-  Exclude:
-    - 'test/authentication/test_agent.rb'
-    - 'test/authentication/test_certificate.rb'
-    - 'test/integration/test_agent.rb'
-
 # Offense count: 1
 Lint/NonLocalExitFromIterator:
   Exclude:
@@ -207,12 +166,6 @@ Lint/UnderscorePrefixedVariableName:
   Exclude:
     - 'lib/net/ssh/test/local_packet.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Lint/UnneededRequireStatement:
-  Exclude:
-    - 'lib/net/ssh/ruby_compat.rb'
-
 # Offense count: 60
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
@@ -229,7 +182,7 @@ Lint/UnusedBlockArgument:
     - 'test/transport/test_algorithms.rb'
     - 'test/transport/test_hmac.rb'
 
-# Offense count: 62
+# Offense count: 65
 # Cop supports --auto-correct.
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
 Lint/UnusedMethodArgument:
@@ -251,11 +204,11 @@ Lint/UselessAssignment:
     - 'test/integration/common.rb'
     - 'test/integration/test_forward.rb'
 
-# Offense count: 229
+# Offense count: 239
 Metrics/AbcSize:
-  Max: 89
+  Max: 71
 
-# Offense count: 15
+# Offense count: 17
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
@@ -266,23 +219,21 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 31
+# Offense count: 33
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 488
 
-# Offense count: 38
+# Offense count: 40
 Metrics/CyclomaticComplexity:
-  Max: 27
-  Exclude:
-    - 'lib/net/ssh/config.rb'
+  Max: 28
 
-# Offense count: 211
+# Offense count: 224
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
-  Max: 82
+  Max: 72
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
   Max: 160
@@ -292,11 +243,11 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 30
+# Offense count: 32
 Metrics/PerceivedComplexity:
   Max: 20
 
-# Offense count: 9
+# Offense count: 10
 Naming/AccessorMethodName:
   Exclude:
     - 'lib/net/ssh/authentication/methods/password.rb'
@@ -313,25 +264,9 @@ Naming/BinaryOperatorParameterName:
     - 'lib/net/ssh/buffer.rb'
     - 'lib/net/ssh/version.rb'
 
-# Offense count: 12
+# Offense count: 16
 Naming/ClassAndModuleCamelCase:
-  Exclude:
-    - 'lib/net/ssh/transport/hmac/md5_96.rb'
-    - 'lib/net/ssh/transport/hmac/sha1_96.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_256.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_256_96.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_256_etm.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_512.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_512_96.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_512_etm.rb'
-    - 'test/transport/hmac/test_md5_96.rb'
-    - 'test/transport/hmac/test_sha1_96.rb'
-    - 'test/transport/hmac/test_sha2_256.rb'
-    - 'test/transport/hmac/test_sha2_256_96.rb'
-    - 'test/transport/hmac/test_sha2_256_etm.rb'
-    - 'test/transport/hmac/test_sha2_512.rb'
-    - 'test/transport/hmac/test_sha2_512_96.rb'
-    - 'test/transport/hmac/test_sha2_512_etm.rb'
+  Enabled: false
 
 # Offense count: 4
 Naming/ConstantName:
@@ -340,7 +275,7 @@ Naming/ConstantName:
     - 'lib/net/ssh/transport/kex/diffie_hellman_group1_sha1.rb'
     - 'lib/net/ssh/transport/openssl.rb'
 
-# Offense count: 11
+# Offense count: 12
 # Configuration parameters: Blacklist.
 # Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
@@ -352,7 +287,7 @@ Naming/HeredocDelimiterNaming:
     - 'test/integration/test_agent.rb'
     - 'test/test_key_factory.rb'
 
-# Offense count: 4
+# Offense count: 5
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
 Naming/MemoizedInstanceVariableName:
@@ -394,7 +329,6 @@ Naming/UncommunicativeMethodParamName:
     - 'lib/net/ssh/authentication/pageant.rb'
     - 'lib/net/ssh/buffer.rb'
     - 'lib/net/ssh/buffered_io.rb'
-    - 'lib/net/ssh/ruby_compat.rb'
     - 'lib/net/ssh/test/socket.rb'
     - 'lib/net/ssh/transport/ctr.rb'
     - 'lib/net/ssh/transport/hmac/abstract.rb'
@@ -446,7 +380,7 @@ Style/AsciiComments:
     - 'lib/net/ssh/authentication/pageant.rb'
     - 'lib/net/ssh/buffered_io.rb'
 
-# Offense count: 8
+# Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
@@ -487,29 +421,12 @@ Style/CharacterLiteral:
   Exclude:
     - 'test/test_buffer.rb'
 
-# Offense count: 15
+# Offense count: 17
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
-  Exclude:
-    - 'lib/net/ssh/transport/ctr.rb'
-    - 'lib/net/ssh/transport/hmac.rb'
-    - 'lib/net/ssh/transport/hmac/md5.rb'
-    - 'lib/net/ssh/transport/hmac/md5_96.rb'
-    - 'lib/net/ssh/transport/hmac/none.rb'
-    - 'lib/net/ssh/transport/hmac/ripemd160.rb'
-    - 'lib/net/ssh/transport/hmac/sha1.rb'
-    - 'lib/net/ssh/transport/hmac/sha1_96.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_256.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_256_96.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_256_etm.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_512.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_512_96.rb'
-    - 'lib/net/ssh/transport/hmac/sha2_512_etm.rb'
-    - 'lib/net/ssh/transport/kex.rb'
-    - 'lib/net/ssh/transport/kex/diffie_hellman_group_exchange_sha1.rb'
-    - 'lib/net/ssh/transport/kex/diffie_hellman_group_exchange_sha256.rb'
+  Enabled: false
 
 # Offense count: 7
 Style/ClassVars:
@@ -554,13 +471,7 @@ Style/ConditionalAssignment:
     - 'lib/net/ssh/transport/state.rb'
     - 'test/test_key_factory.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/DefWithParentheses:
-  Exclude:
-    - 'test/integration/test_forward.rb'
-
-# Offense count: 14
+# Offense count: 13
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -568,7 +479,6 @@ Style/Documentation:
     - 'lib/net/ssh/authentication/ed25519.rb'
     - 'lib/net/ssh/connection/keepalive.rb'
     - 'lib/net/ssh/connection/session.rb'
-    - 'lib/net/ssh/ruby_compat.rb'
     - 'lib/net/ssh/test/extensions.rb'
     - 'lib/net/ssh/transport/kex.rb'
     - 'lib/net/ssh/transport/key_expander.rb'
@@ -602,14 +512,14 @@ Style/FormatStringToken:
   Exclude:
     - 'lib/net/ssh/loggable.rb'
 
-# Offense count: 166
+# Offense count: 171
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 34
+# Offense count: 35
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
@@ -620,7 +530,7 @@ Style/IfInsideElse:
   Exclude:
     - 'lib/net/ssh/connection/session.rb'
 
-# Offense count: 16
+# Offense count: 13
 # Cop supports --auto-correct.
 Style/IfUnlessModifier:
   Exclude:
@@ -629,8 +539,6 @@ Style/IfUnlessModifier:
     - 'lib/net/ssh/proxy/command.rb'
     - 'lib/net/ssh/service/forward.rb'
     - 'lib/net/ssh/transport/ctr.rb'
-    - 'lib/net/ssh/transport/kex.rb'
-    - 'lib/net/ssh/transport/kex/abstract5656.rb'
     - 'lib/net/ssh/transport/key_expander.rb'
     - 'test/integration/test_proxy.rb'
     - 'test/test_key_factory.rb'
@@ -690,7 +598,7 @@ Style/MultipleComparison:
 Style/MutableConstant:
   Enabled: false
 
-# Offense count: 13
+# Offense count: 14
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: both, prefix, postfix
@@ -734,7 +642,7 @@ Style/Not:
   Exclude:
     - 'lib/net/ssh/connection/channel.rb'
 
-# Offense count: 8
+# Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
@@ -771,7 +679,7 @@ Style/ParenthesesAroundCondition:
     - 'lib/net/ssh/transport/ctr.rb'
     - 'test/integration/test_proxy.rb'
 
-# Offense count: 33
+# Offense count: 23
 # Cop supports --auto-correct.
 # Configuration parameters: PreferredDelimiters.
 Style/PercentLiteralDelimiters:
@@ -819,19 +727,13 @@ Style/RedundantBegin:
     - 'lib/net/ssh/verifiers/accept_new.rb'
     - 'test/manual/test_pageant.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantParentheses:
-  Exclude:
-    - 'support/arcfour_check.rb'
-
-# Offense count: 59
+# Offense count: 61
 # Cop supports --auto-correct.
 # Configuration parameters: AllowMultipleReturnValues.
 Style/RedundantReturn:
   Enabled: false
 
-# Offense count: 14
+# Offense count: 18
 # Cop supports --auto-correct.
 Style/RedundantSelf:
   Exclude:
@@ -910,14 +812,14 @@ Style/SpecialGlobalVars:
     - 'test/manual/test_pageant.rb'
     - 'test/test_all.rb'
 
-# Offense count: 1754
+# Offense count: 1801
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
 
-# Offense count: 11
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: IgnoredMethods.
 # IgnoredMethods: respond_to, define_method
@@ -928,8 +830,6 @@ Style/SymbolProc:
     - 'lib/net/ssh/connection/session.rb'
     - 'lib/net/ssh/test/extensions.rb'
     - 'lib/net/ssh/transport/algorithms.rb'
-    - 'test/integration/test_forward.rb'
-    - 'test/test/test_test.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -937,20 +837,18 @@ Style/UnneededCondition:
   Exclude:
     - 'lib/net/ssh/proxy/command.rb'
 
-# Offense count: 4
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/UnneededInterpolation:
   Exclude:
     - 'lib/net/ssh/proxy/socks5.rb'
     - 'lib/net/ssh/transport/session.rb'
-    - 'test/integration/test_forward.rb'
 
-# Offense count: 15
+# Offense count: 2
 # Cop supports --auto-correct.
 Style/UnneededPercentQ:
   Exclude:
     - 'net-ssh.gemspec'
-    - 'test/test_config.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
@@ -973,10 +871,3 @@ Style/ZeroLengthPredicate:
   Exclude:
     - 'lib/net/ssh/buffered_io.rb'
     - 'lib/net/ssh/connection/channel.rb'
-
-# Offense count: 1636
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 932

data/CHANGES.txt

@@ -1,3 +1,32 @@
+=== 6.2.0. beta1
+
+  * rsa-sha2-512, rsa-sha2-256 host_key algs [#771]
+  * JRuby aes*-ctr suppport [#767]
+
+=== 6.1.0
+
+  * Adapt to ssh's default behaviors when no username is provided.
+    When Net::SSH.start user is nil and config has no entry
+    we default to Etc.getpwuid.name() instead of Etc.getlogin(). [#749]
+
+=== 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]
+
+=== 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]
@@ -35,7 +64,7 @@
 
 === 5.0.2
 
-  * fix ctr for jruby [#612]
+  * Fix ctr for jruby [#612]
 
 === 5.0.1
 

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.rb

@@ -251,7 +251,7 @@ module Net
       transport = Transport::Session.new(host, options)
       auth = Authentication::Session.new(transport, options)
 
-      user = options.fetch(:user, user) || Etc.getlogin
+      user = options.fetch(:user, user) || Etc.getpwuid.name
       if auth.authenticate("ssh-connection", user, options[:password])
         connection = Connection::Session.new(transport, options)
         if block_given?

data/lib/net/ssh/authentication/certificate.rb

@@ -35,8 +35,9 @@ module Net
           cert.valid_before = if RUBY_PLATFORM == "java"
                                 # 0x20c49ba5e353f7 = 0x7fffffffffffffff/1000, the largest value possible for JRuby
                                 # JRuby Time.at multiplies the arg by 1000, and then stores it in a signed long.
-                                # 0x20c49ba5e353f7 = 292278994-08-17 01:12:55 -0600
-                                Time.at([0x20c49ba5e353f7, buffer.read_int64].min)
+                                # 0x20c49ba2d52500 = 292278993-01-01 00:00:00 +0000
+                                # JRuby 9.1 does not accept the year 292278994 because of edge cases (https://github.com/JodaOrg/joda-time/issues/190)
+                                Time.at([0x20c49ba2d52500, buffer.read_int64].min)
                               else
                                 Time.at(buffer.read_int64)
                               end
@@ -69,8 +70,8 @@ module Net
           key.ssh_do_sign(data)
         end
 
-        def ssh_do_verify(sig, data)
-          key.ssh_do_verify(sig, data)
+        def ssh_do_verify(sig, data, options = {})
+          key.ssh_do_verify(sig, data, options)
         end
 
         def to_pem

data/lib/net/ssh/authentication/ed25519.rb

@@ -123,7 +123,7 @@ module Net
             ssh_type
           end
 
-          def ssh_do_verify(sig,data)
+          def ssh_do_verify(sig, data, options = {})
             @verify_key.verify(sig,data)
           end
 

data/lib/net/ssh/test/channel.rb

@@ -146,4 +146,4 @@ module Net
 
     end
   end
-end
+end

data/lib/net/ssh/test/remote_packet.rb

@@ -39,4 +39,4 @@ module Net
 
     end
   end
-end
+end

data/lib/net/ssh/test/script.rb

@@ -179,4 +179,4 @@ module Net
 
     end
   end
-end
+end

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

@@ -33,7 +33,9 @@ module Net
                        ecdsa-sha2-nistp256
                        ssh-rsa-cert-v01@openssh.com
                        ssh-rsa-cert-v00@openssh.com
-                       ssh-rsa],
+                       ssh-rsa
+                       rsa-sha2-256
+                       rsa-sha2-512],
 
           kex: %w[ecdh-sha2-nistp521
                   ecdh-sha2-nistp384
@@ -290,10 +292,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/transport/cipher_factory.rb

@@ -22,9 +22,9 @@ module Net
           "3des-ctr"                    => "des-ede3",
           "blowfish-ctr"                => "bf-ecb",
 
-          'aes256-ctr'                  => 'aes-256-ctr',
-          'aes192-ctr'                  => 'aes-192-ctr',
-          'aes128-ctr'                  => 'aes-128-ctr',
+          "aes256-ctr"                  => ::OpenSSL::Cipher.ciphers.include?("aes-256-ctr") ? "aes-256-ctr" : "aes-256-ecb",
+          "aes192-ctr"                  => ::OpenSSL::Cipher.ciphers.include?("aes-192-ctr") ? "aes-192-ctr" : "aes-192-ecb",
+          "aes128-ctr"                  => ::OpenSSL::Cipher.ciphers.include?("aes-128-ctr") ? "aes-128-ctr" : "aes-128-ecb",
           'cast128-ctr'                 => 'cast5-ecb',
 
           'none'                        => 'none'

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

@@ -64,11 +64,16 @@ module Net
 
           private
 
+          def matching?(key_ssh_type, host_key_alg)
+            return true if key_ssh_type == host_key_alg
+            return true if key_ssh_type == 'ssh-rsa' && ['rsa-sha2-512', 'rsa-sha2-256'].include?(host_key_alg)
+          end
+
           # Verify that the given key is of the expected type, and that it
           # really is the key for the session's host. Raise Net::SSH::Exception
           # if it is not.
           def verify_server_key(key) #:nodoc:
-            if key.ssh_type != algorithms.host_key
+            unless matching?(key.ssh_type, algorithms.host_key)
               raise Net::SSH::Exception, "host key algorithm mismatch '#{key.ssh_type}' != '#{algorithms.host_key}'"
             end
 
@@ -97,7 +102,9 @@ module Net
 
             hash = digester.digest(response.to_s)
 
-            unless connection.host_key_verifier.verify_signature { result[:server_key].ssh_do_verify(result[:server_sig], hash) }
+            server_key = result[:server_key]
+            server_sig = result[:server_sig]
+            unless connection.host_key_verifier.verify_signature { server_key.ssh_do_verify(server_sig, hash, host_key: algorithms.host_key) }
               raise Net::SSH::Exception, 'could not verify server signature'
             end
 

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

@@ -63,8 +63,17 @@ module OpenSSL
       end
 
       # Verifies the given signature matches the given data.
-      def ssh_do_verify(sig, data)
-        verify(OpenSSL::Digest::SHA1.new, sig, data)
+      def ssh_do_verify(sig, data, options = {})
+        digester =
+          if options[:host_key] == "rsa-sha2-512"
+            OpenSSL::Digest::SHA512.new
+          elsif options[:host_key] == "rsa-sha2-256"
+            OpenSSL::Digest::SHA256.new
+          else
+            OpenSSL::Digest::SHA1.new
+          end
+
+        verify(digester, sig, data)
       end
 
       # Returns the signature for the given data.
@@ -94,7 +103,7 @@ module OpenSSL
       end
 
       # Verifies the given signature matches the given data.
-      def ssh_do_verify(sig, data)
+      def ssh_do_verify(sig, data, options = {})
         sig_r = sig[0,20].unpack("H*")[0].to_i(16)
         sig_s = sig[20,20].unpack("H*")[0].to_i(16)
         a1sig = OpenSSL::ASN1::Sequence([
@@ -192,7 +201,7 @@ module OpenSSL
       end
 
       # Verifies the given signature matches the given data.
-      def ssh_do_verify(sig, data)
+      def ssh_do_verify(sig, data, options = {})
         digest = digester.digest(data)
         a1sig = nil
 

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

@@ -215,12 +215,13 @@ 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
 
           if @packet.nil?
             minimum = server.block_size < 4 ? 4 : server.block_size
-            return nil if available < minimum
+            return nil if available < minimum + aad_length
             data = read_available(minimum + aad_length)
 
             # decipher it
@@ -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

@@ -49,14 +49,14 @@ module Net
       MAJOR = 6
 
       # The minor component of this version of the Net::SSH library
-      MINOR = 0
+      MINOR = 2
 
       # The tiny component of this version of the Net::SSH library
       TINY  = 0
 
       # The prerelease component of this version of the Net::SSH library
       # nil allowed
-      PRE   = nil
+      PRE   = "beta1"
 
       # 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.0
+  version: 6.2.0.beta1
 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-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt_pbkdf
@@ -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: