diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-05-21 16:01:28 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-05-21 16:01:28 -0700 |
| commit | 499df5276e668302357d305bc55568eceaf53dd0 (patch) | |
| tree | c76c43920b9bc5fceae6f3dad279de726a6f5dde | |
| parent | 95e99f3fb6b1fdb16827f398a174ee4987909ed1 (diff) | |
| download | chef-499df5276e668302357d305bc55568eceaf53dd0.tar.gz | |
Update bcrypt_pbkdf to resolve issues running from windows nodes
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 6 deletions
@@ -7,7 +7,6 @@ source "https://rubygems.org" # of bundler versions prior to 1.12.0 (https://github.com/bundler/bundler/commit/193a14fe5e0d56294c7b370a0e59f93b2c216eed) gem "chef", path: "." -# necessary until we release ohai 15 gem "ohai", git: "https://github.com/chef/ohai.git", branch: "15-stable" gem "chef-utils", path: File.expand_path("../chef-utils", __FILE__) if File.exist?(File.expand_path("../chef-utils", __FILE__)) @@ -33,7 +32,7 @@ group(:omnibus_package) do gem "inspec-core-bin", "~> 4.18" # need to provide the binaries for inspec gem "chef-vault" gem "ed25519" # ed25519 ssh key support done here as it's a native gem we can't put in train - gem "bcrypt_pbkdf" # ed25519 ssh key support done here as it's a native gem we can't put in train + gem "bcrypt_pbkdf", ">= 1.1.0.rc1" # ed25519 ssh key support done here as it's a native gem we can't put in train end group(:omnibus_package, :pry) do diff --git a/Gemfile.lock b/Gemfile.lock index 77b2d4d54f..ac6671f6cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -135,9 +135,9 @@ GEM mixlib-cli (>= 1.4, < 3.0) mixlib-shellout (>= 2.0, < 4.0) ast (2.4.0) - bcrypt_pbkdf (1.0.1) - bcrypt_pbkdf (1.0.1-x64-mingw32) - bcrypt_pbkdf (1.0.1-x86-mingw32) + bcrypt_pbkdf (1.1.0.rc1) + bcrypt_pbkdf (1.1.0.rc1-x64-mingw32) + bcrypt_pbkdf (1.1.0.rc1-x86-mingw32) binding_of_caller (0.8.0) debug_inspector (>= 0.0.1) builder (3.2.4) @@ -453,7 +453,7 @@ PLATFORMS DEPENDENCIES appbundler - bcrypt_pbkdf + bcrypt_pbkdf (>= 1.1.0.rc1) chef! chef-bin! chef-config! |