diff options
author | Tim Smith <tsmith84@gmail.com> | 2021-10-05 16:04:19 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2021-10-05 16:04:45 -0700 |
commit | 956067ca37ec894ccf2a389a0d197084cf843ea9 (patch) | |
tree | 953290dc73defa195215e2589f4f2d3802ae4001 | |
parent | f02bbdb0efe742a144d528378545b17f1e79d27c (diff) | |
download | chef-956067ca37ec894ccf2a389a0d197084cf843ea9.tar.gz |
Move ed25519 dep into the gemfile
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | Gemfile | 5 | ||||
-rw-r--r-- | Gemfile.lock | 2 | ||||
-rw-r--r-- | knife/knife.gemspec | 1 |
3 files changed, 7 insertions, 1 deletions
@@ -39,6 +39,11 @@ group(:ruby_shadow) do gem "ruby-shadow", git: "https://github.com/chef/ruby-shadow", branch: "lcg/ruby-3.0", platforms: :ruby end +# deps that cannot be put in the knife gem because they require a compiler and fail on windows nodes +group(:knife_windows_deps) do + gem "ed25519", "~> 1.2" # ed25519 ssh key support +end + group(:development, :test) do gem "rake" gem "rspec" diff --git a/Gemfile.lock b/Gemfile.lock index 9e5adab91f..9bc482678d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,6 +183,7 @@ GEM rexml debug_inspector (1.1.0) diff-lcs (1.3) + ed25519 (1.2.4) erubi (1.10.0) erubis (2.7.0) faraday (1.4.3) @@ -447,6 +448,7 @@ DEPENDENCIES chef-vault cheffish (>= 17) chefstyle! + ed25519 (~> 1.2) fauxhai-ng inspec-core-bin (~> 4.24) ohai! diff --git a/knife/knife.gemspec b/knife/knife.gemspec index 85c93bbdc4..d121343211 100644 --- a/knife/knife.gemspec +++ b/knife/knife.gemspec @@ -28,7 +28,6 @@ Gem::Specification.new do |s| s.add_dependency "ffi-yajl", "~> 2.2" s.add_dependency "net-ssh", ">= 5.1", "< 7" s.add_dependency "net-ssh-multi", "~> 1.2", ">= 1.2.1" - s.add_dependency "ed25519", "~> 1.2" # ed25519 ssh key support s.add_dependency "bcrypt_pbkdf", "~> 1.1" # ed25519 ssh key support # disabling this until we get get it to compile on RHEL 7 # s.add_dependency "x25519", ">= 1.0.9" # ed25519 KEX module. 1.0.9+ required to resolve sigill failures |