Allow for the latest net-ssh and ffi 1.13.1

New net-ssh has several important improvements that our users will
probably want:

  * Support empty lines and comments in known_hosts [donoghuc, #742]
  * Add sha2-{256,512}-etm@openssh.com MAC algorithms [graaff, #714]
  * curve25519sha256 support [Florian Wininger ,#690]

Signed-off-by: Tim Smith <tsmith@chef.io>

3 files changed, 23 insertions, 22 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 8d911f08e0..7e12beb1e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -50,8 +50,8 @@ PATH
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 3.0.3, < 4.0)
-      net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 4.2, < 6)
+      net-sftp (>= 2.1.2, < 4.0)
+      net-ssh (>= 4.2, < 7)
       net-ssh-multi (~> 1.2, >= 1.2.1)
       ohai (~> 16.0)
       pastel
@@ -85,8 +85,8 @@ PATH
       mixlib-cli (>= 2.1.1, < 3.0)
       mixlib-log (>= 2.0.3, < 4.0)
       mixlib-shellout (>= 3.0.3, < 4.0)
-      net-sftp (~> 2.1, >= 2.1.2)
-      net-ssh (>= 4.2, < 6)
+      net-sftp (>= 2.1.2, < 4.0)
+      net-ssh (>= 4.2, < 7)
       net-ssh-multi (~> 1.2, >= 1.2.1)
       ohai (~> 16.0)
       pastel
@@ -260,11 +260,11 @@ GEM
     multi_json (1.14.1)
     multipart-post (2.1.1)
     necromancer (0.5.1)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (5.2.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-sftp (3.0.0)
+      net-ssh (>= 5.0.0, < 7.0.0)
+    net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     net-ssh-multi (1.2.1)
@@ -353,12 +353,13 @@ GEM
     tins (1.25.0)
       sync
     tomlrb (1.3.0)
-    train-core (3.2.28)
+    train-core (3.3.1)
       addressable (~> 2.5)
+      ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
-      net-scp (>= 1.2, < 3.0)
-      net-ssh (>= 2.9, < 6.0)
+      net-scp (>= 1.2, < 4.0)
+      net-ssh (>= 2.9, < 7.0)
     train-winrm (0.2.6)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
diff --git a/chef.gemspec b/chef.gemspec
index f72d091d60..69644f0fb5 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -30,9 +30,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "ffi", ">= 1.9.25"
   s.add_dependency "ffi-yajl", "~> 2.2"
-  s.add_dependency "net-ssh", ">= 4.2", "< 6"
+  s.add_dependency "net-ssh", ">= 4.2", "< 7"
   s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
-  s.add_dependency "net-sftp", "~> 2.1", ">= 2.1.2"
+  s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0"
   s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support
   s.add_dependency "bcrypt_pbkdf", "= 1.1.0.rc1" # ed25519 ssh key support
   s.add_dependency "highline", ">= 1.6.9", "< 3"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index d7a83eeafa..e91e6a4946 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -33,8 +33,8 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.325.0)
-    aws-sdk-core (3.97.1)
+    aws-partitions (1.327.0)
+    aws-sdk-core (3.98.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -172,9 +172,9 @@ GEM
     erubis (2.7.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
-    ffi (1.12.2-x64-mingw32)
-    ffi (1.12.2-x86-mingw32)
+    ffi (1.12.1)
+    ffi (1.12.1-x64-mingw32)
+    ffi (1.12.1-x86-mingw32)
     ffi-libarchive (1.0.0)
       ffi (~> 1.0)
     ffi-win32-extensions (1.0.3)
@@ -313,13 +313,13 @@ GEM
     toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
     tomlrb (1.3.0)
-    train-core (3.2.37)
+    train-core (3.3.1)
       addressable (~> 2.5)
-      ffi (< 1.13)
+      ffi (!= 1.13.0)
       json (>= 1.8, < 3.0)
       mixlib-shellout (>= 2.0, < 4.0)
       net-scp (>= 1.2, < 4.0)
-      net-ssh (>= 2.9, < 6.0)
+      net-ssh (>= 2.9, < 7.0)
     train-winrm (0.2.6)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)