summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-12-09 07:42:49 -0800
committerGitHub <noreply@github.com>2020-12-09 07:42:49 -0800
commit2399214cfc4ca0078f7a54adce882a93d9a5d9b0 (patch)
tree5d7dbd5778d24f14b17f5fe2730c35474403823a
parentf50dd16ca54ffa338190b148d7bd7a6cc09f376f (diff)
parent7217f748225b2c22120f7522a2e42ee3dc5b6359 (diff)
downloadchef-2399214cfc4ca0078f7a54adce882a93d9a5d9b0.tar.gz
Merge pull request #10717 from MsysTechnologiesllc/Kapil/Github-10678_verify_host_key_false_is_deprecated
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--chef.gemspec2
-rw-r--r--lib/chef/knife/ssh.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/chef.gemspec b/chef.gemspec
index 9379e74fa7..876ee3f513 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -31,7 +31,7 @@ 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", "< 7"
+ s.add_dependency "net-ssh", ">= 5.1", "< 7"
s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1"
s.add_dependency "net-sftp", ">= 2.1.2", "< 4.0"
s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support
diff --git a/lib/chef/knife/ssh.rb b/lib/chef/knife/ssh.rb
index a586bf37c2..8b254c13aa 100644
--- a/lib/chef/knife/ssh.rb
+++ b/lib/chef/knife/ssh.rb
@@ -289,7 +289,7 @@ class Chef
opts[:port] = port unless port.nil?
opts[:logger] = Chef::Log.with_child(subsystem: "net/ssh") if Chef::Log.level == :trace
unless config[:host_key_verify]
- opts[:verify_host_key] = false
+ opts[:verify_host_key] = :never
opts[:user_known_hosts_file] = "/dev/null"
end
if ssh_config[:keepalive]