diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-11 20:39:27 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-11 20:44:10 +0000 |
| commit | 2b283dd81fbbcbad9e5b6b8ae37f10fb6f9dc01d (patch) | |
| tree | 70c6de6a48926865abd966846e0db56374b5a21b | |
| parent | a1215556ec6c5ab84862519b82cee99645dad357 (diff) | |
| download | gitlab-ce-2b283dd81fbbcbad9e5b6b8ae37f10fb6f9dc01d.tar.gz | |
Update sshkey to v2.0.0
This release fixes a bug in handling certain ed25519 keys. For more
details, see this GitHub issue:
https://github.com/bensie/sshkey/issues/34
| -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 |