From 390f4d52db891522a7773ff839c33a66bbcb8b38 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@rapid7.com>
Date: Tue, 1 Aug 2017 15:26:50 -0500
Subject: [PATCH] add ed25519 support for net-ssh

---
 Gemfile.lock                 | 9 +++++++++
 metasploit-framework.gemspec | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/Gemfile.lock b/Gemfile.lock
index 76395a1227..6d0cf9de61 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,6 +19,7 @@ PATH
       activesupport (~> 4.2.6)
       backports
       bcrypt
+      bcrypt_pbkdf
       bit-struct
       dnsruby
       filesize
@@ -47,6 +48,8 @@ PATH
       pg (= 0.20.0)
       railties
       rb-readline
+      rbnacl (< 5.0.0)
+      rbnacl-libsodium
       recog
       redcarpet
       rex-arch
@@ -116,6 +119,7 @@ GEM
       activerecord (>= 3.1.0, < 6)
     backports (3.8.0)
     bcrypt (3.1.11)
+    bcrypt_pbkdf (1.0.0)
     bindata (2.4.0)
     bit-struct (0.16)
     builder (3.2.3)
@@ -130,6 +134,7 @@ GEM
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.18)
     filesize (0.1.1)
     fivemat (1.3.5)
     google-protobuf (3.3.0)
@@ -245,6 +250,10 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
+    rbnacl (4.0.2)
+      ffi
+    rbnacl-libsodium (1.0.11)
+      rbnacl (>= 3.0.1)
     recog (2.1.11)
       nokogiri
     redcarpet (3.4.0)
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index c1bcb930db..00371dba2a 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -124,6 +124,9 @@ Gem::Specification.new do |spec|
   #
   spec.add_runtime_dependency 'dnsruby'
   spec.add_runtime_dependency 'net-ssh'
+  spec.add_runtime_dependency 'rbnacl', ['< 5.0.0']
+  spec.add_runtime_dependency 'rbnacl-libsodium'
+  spec.add_runtime_dependency 'bcrypt_pbkdf'
   spec.add_runtime_dependency 'ruby_smb'
 
   #