From ef3a86aa80d1f7e66167e6714d4b645bee75d957 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Wed, 4 Nov 2020 16:02:47 +0100
Subject: [PATCH] Gemfile: add dependency to handle ed25519 SSH keys when a
rake task uses SSH
---
Gemfile | 3 +++
Gemfile.lock | 12 ++++++++++++
2 files changed, 15 insertions(+)
diff --git a/Gemfile b/Gemfile
index 79aacc0e88..325d311547 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,9 @@ gem "hashdiff"
gem "diffy"
gem "mediawiki_api"
gem "net-ssh"
+gem "rbnacl", "~> 3.2", "< 5.0"
+gem "rbnacl-libsodium"
+gem "bcrypt_pbkdf", "~> 1.0"
gem "dns-zone"
gem "ruby-cute", :require => "cute"
gem "peach"
diff --git a/Gemfile.lock b/Gemfile.lock
index 02e05b535b..906bdbc467 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,6 +14,7 @@ GEM
equalizer (~> 0.0.11)
ast (2.4.0)
backports (3.15.0)
+ bcrypt_pbkdf (1.0.1)
bond (0.4.3)
cheetah (0.5.0)
abstract_method (~> 1.2)
@@ -42,6 +43,7 @@ GEM
http-cookie (~> 1.0.0)
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
+ ffi (1.13.1)
hash_validator (1.0.0)
hashdiff (1.0.0)
http-cookie (1.0.3)
@@ -102,6 +104,10 @@ GEM
rack-protection (1.5.5)
rack
rb-readline (0.5.5)
+ rbnacl (3.4.0)
+ ffi
+ rbnacl-libsodium (1.0.16)
+ rbnacl (>= 3.0.1)
regexp_parser (1.6.0)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
@@ -183,6 +189,7 @@ PLATFORMS
ruby
DEPENDENCIES
+ bcrypt_pbkdf (~> 1.0)
code-explorer
diffy
dns-zone
@@ -192,8 +199,13 @@ DEPENDENCIES
mutant-rspec
net-ssh
peach
+ rbnacl (~> 3.2, < 5.0)
+ rbnacl-libsodium
restfully
rspec
ruby-cute
simplecov
webmock
+
+BUNDLED WITH
+ 1.17.3
--
GitLab