summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc A. Paradise <marc.paradise@gmail.com>2020-04-27 13:29:50 -0400
committerMarc A. Paradise <marc.paradise@gmail.com>2020-04-27 14:03:14 -0400
commit58e0958595bb7f673c442dd925961aa144dff6c0 (patch)
tree5daa0a6d1a905278e0ede3c1ceec632c064ec1d8
parent03edd0484be1c28d9352b0d98fe65b34273d76b7 (diff)
downloadchef-58e0958595bb7f673c442dd925961aa144dff6c0.tar.gz
Update bcrypt_pbkdf to 1.1.0.rc1
This provides working ed25519 ssh support for Windows under Rubies 2.4-2.7. I'm submitting this with the RC gem instead of waiting for final release because because we don't have a timeline from the maintainer when the RC will be finalized. Part of this is because no decision as been made as to whether to do a major version bump for the gem. Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock8
2 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 61176cb926..60120ffe22 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,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 91c05dbee8..0f7d063626 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -139,9 +139,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)
@@ -454,7 +454,7 @@ PLATFORMS
DEPENDENCIES
appbundler
- bcrypt_pbkdf
+ bcrypt_pbkdf (>= 1.1.0.rc1)
chef!
chef-bin!
chef-config!