merge screwed up gesmepc

David Maloney · David Maloney · commit 8b430826c677 · 2016-07-05T11:08:57.000-05:00
add net-ssh back into the gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -17,6 +17,7 @@ PATH
       metasploit-payloads (= 1.1.12)
       metasploit_data_models
       msgpack
+      net-ssh
       network_interface
       nokogiri
       octokit
@@ -172,6 +173,7 @@ GEM
     multi_json (1.12.0)
     multi_test (0.1.2)
     multipart-post (2.0.0)
+    net-ssh (3.2.0)
     network_interface (0.0.1)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
@@ -103,6 +103,11 @@ Gem::Specification.new do |spec|
   # BitStruct Library used for handling certain Protocol Header/Packet construction
   spec.add_runtime_dependency 'bit-struct'
 
+  #
+  # Protocol Libraries
+  #
+  spec.add_runtime_dependency 'net-ssh'
+
   #
   # REX Libraries
   #

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,11 @@ Gem::Specification.new do \|spec\|`
`103`	`103`	`# BitStruct Library used for handling certain Protocol Header/Packet construction`
`104`	`104`	`spec.add_runtime_dependency 'bit-struct'`
`105`	`105`
	`106`	`+ #`
	`107`	`+ # Protocol Libraries`
	`108`	`+ #`
	`109`	`+ spec.add_runtime_dependency 'net-ssh'`
	`110`	`+`
`106`	`111`	`#`
`107`	`112`	`# REX Libraries`
`108`	`113`	`#`