Commit a06c7ef3 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch '347695-nameerror-uninitialized-constant-net-ssh-authentication-ed25519' into 'master'

Upgrade bcrypt_pbkdf gem to version 1.1.0

See merge request gitlab-org/gitlab!76494
parents 5ecd1a7c 43c64991
...@@ -476,7 +476,7 @@ gem 'sshkey', '~> 2.0' ...@@ -476,7 +476,7 @@ gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support # Required for ED25519 SSH host key support
group :ed25519 do group :ed25519 do
gem 'ed25519', '~> 1.2' gem 'ed25519', '~> 1.2'
gem 'bcrypt_pbkdf', '~> 1.0' gem 'bcrypt_pbkdf', '~> 1.1'
end end
# Spamcheck GRPC protocol definitions # Spamcheck GRPC protocol definitions
......
...@@ -137,7 +137,7 @@ GEM ...@@ -137,7 +137,7 @@ GEM
base32 (0.3.2) base32 (0.3.2)
batch-loader (2.0.1) batch-loader (2.0.1)
bcrypt (3.1.16) bcrypt (3.1.16)
bcrypt_pbkdf (1.0.0) bcrypt_pbkdf (1.1.0)
benchmark (0.1.1) benchmark (0.1.1)
benchmark-ips (2.3.0) benchmark-ips (2.3.0)
benchmark-memory (0.1.2) benchmark-memory (0.1.2)
...@@ -1410,7 +1410,7 @@ DEPENDENCIES ...@@ -1410,7 +1410,7 @@ DEPENDENCIES
base32 (~> 0.3.0) base32 (~> 0.3.0)
batch-loader (~> 2.0.1) batch-loader (~> 2.0.1)
bcrypt (~> 3.1, >= 3.1.14) bcrypt (~> 3.1, >= 3.1.14)
bcrypt_pbkdf (~> 1.0) bcrypt_pbkdf (~> 1.1)
benchmark-ips (~> 2.3.0) benchmark-ips (~> 2.3.0)
benchmark-memory (~> 0.1) benchmark-memory (~> 0.1)
better_errors (~> 2.9.0) better_errors (~> 2.9.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment