diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-02-12 09:43:16 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-02-12 09:43:16 +0000 |
| commit | be3de699d01aefad996d44a32541cc4cbca94683 (patch) | |
| tree | f9eddf5a50728e7a8d14fae7b75c67de1184a7eb | |
| parent | a9c4eaf992e67d9d6e7c10a8685c93ec864d086a (diff) | |
| parent | 2b283dd81fbbcbad9e5b6b8ae37f10fb6f9dc01d (diff) | |
| download | gitlab-ce-be3de699d01aefad996d44a32541cc4cbca94683.tar.gz | |
Merge branch '47150-update-sshkey' into 'master'
Update sshkey to v2.0.0
Closes #47150
See merge request gitlab-org/gitlab-ce!25115
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/47150-update-sshkey.yml | 5 |
3 files changed, 8 insertions, 3 deletions
@@ -410,7 +410,7 @@ gem 'sys-filesystem', '~> 1.1.6' # SSH host key support gem 'net-ssh', '~> 5.0' -gem 'sshkey', '~> 1.9.0' +gem 'sshkey', '~> 2.0' # Required for ED25519 SSH host key support group :ed25519 do diff --git a/Gemfile.lock b/Gemfile.lock index 9aea8919287..92dd5dac0ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -855,7 +855,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) sqlite3 (1.3.13) - sshkey (1.9.0) + sshkey (2.0.0) stackprof (0.2.10) state_machines (0.5.0) state_machines-activemodel (0.5.1) @@ -1157,7 +1157,7 @@ DEPENDENCIES spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) - sshkey (~> 1.9.0) + sshkey (~> 2.0) stackprof (~> 0.2.10) state_machines-activerecord (~> 0.5.1) sys-filesystem (~> 1.1.6) diff --git a/changelogs/unreleased/47150-update-sshkey.yml b/changelogs/unreleased/47150-update-sshkey.yml new file mode 100644 index 00000000000..342bdb1e2bc --- /dev/null +++ b/changelogs/unreleased/47150-update-sshkey.yml @@ -0,0 +1,5 @@ +--- +title: Fix validation of certain ed25519 keys +merge_request: 25115 +author: Merlijn B. W. Wajer +type: fixed |