Commit be3de699 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch '47150-update-sshkey' into 'master'

Update sshkey to v2.0.0

Closes #47150

See merge request gitlab-org/gitlab-ce!25115
parents a9c4eaf9 2b283dd8
...@@ -410,7 +410,7 @@ gem 'sys-filesystem', '~> 1.1.6' ...@@ -410,7 +410,7 @@ gem 'sys-filesystem', '~> 1.1.6'
# SSH host key support # SSH host key support
gem 'net-ssh', '~> 5.0' gem 'net-ssh', '~> 5.0'
gem 'sshkey', '~> 1.9.0' gem 'sshkey', '~> 2.0'
# Required for ED25519 SSH host key support # Required for ED25519 SSH host key support
group :ed25519 do group :ed25519 do
......
...@@ -855,7 +855,7 @@ GEM ...@@ -855,7 +855,7 @@ GEM
activesupport (>= 4.0) activesupport (>= 4.0)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
sqlite3 (1.3.13) sqlite3 (1.3.13)
sshkey (1.9.0) sshkey (2.0.0)
stackprof (0.2.10) stackprof (0.2.10)
state_machines (0.5.0) state_machines (0.5.0)
state_machines-activemodel (0.5.1) state_machines-activemodel (0.5.1)
...@@ -1157,7 +1157,7 @@ DEPENDENCIES ...@@ -1157,7 +1157,7 @@ DEPENDENCIES
spring (~> 2.0.0) spring (~> 2.0.0)
spring-commands-rspec (~> 1.0.4) spring-commands-rspec (~> 1.0.4)
sprockets (~> 3.7.0) sprockets (~> 3.7.0)
sshkey (~> 1.9.0) sshkey (~> 2.0)
stackprof (~> 0.2.10) stackprof (~> 0.2.10)
state_machines-activerecord (~> 0.5.1) state_machines-activerecord (~> 0.5.1)
sys-filesystem (~> 1.1.6) sys-filesystem (~> 1.1.6)
......
---
title: Fix validation of certain ed25519 keys
merge_request: 25115
author: Merlijn B. W. Wajer
type: fixed
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