Land #11179, Replace Sysrandom with Ruby default SecureRandom

GSoC/Meterpreter_Web_Console
Brent Cook 2018-12-27 11:33:29 -06:00
commit 66505790f9
No known key found for this signature in database
GPG Key ID: 1FFAA0B24B708F96
7 changed files with 5 additions and 9 deletions

View File

@ -68,7 +68,6 @@ PATH
sinatra sinatra
sqlite3 sqlite3
sshkey sshkey
sysrandom
thin thin
tzinfo tzinfo
tzinfo-data tzinfo-data
@ -342,7 +341,6 @@ GEM
sqlite3 (1.3.13) sqlite3 (1.3.13)
sshkey (1.9.0) sshkey (1.9.0)
swagger-blocks (2.0.2) swagger-blocks (2.0.2)
sysrandom (1.0.5)
thin (1.7.2) thin (1.7.2)
daemons (~> 1.0, >= 1.0.9) daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4) eventmachine (~> 1.0, >= 1.0.4)
@ -384,4 +382,4 @@ DEPENDENCIES
yard yard
BUNDLED WITH BUNDLED WITH
1.16.6 1.17.1

View File

@ -121,7 +121,6 @@ sinatra, 1.4.8, MIT
sqlite3, 1.3.13, "New BSD" sqlite3, 1.3.13, "New BSD"
sshkey, 1.9.0, MIT sshkey, 1.9.0, MIT
swagger-blocks, 2.0.2, MIT swagger-blocks, 2.0.2, MIT
sysrandom, 1.0.5, ISC
thin, 1.7.2, "GPLv2+, Ruby 1.8" thin, 1.7.2, "GPLv2+, Ruby 1.8"
thor, 0.20.3, MIT thor, 0.20.3, MIT
thread_safe, 0.3.6, "Apache 2.0" thread_safe, 0.3.6, "Apache 2.0"

View File

@ -1,5 +1,5 @@
require 'bcrypt' require 'bcrypt'
require 'sysrandom/securerandom' require 'securerandom'
module Msf::DBManager::User module Msf::DBManager::User

View File

@ -1,6 +1,6 @@
require 'securerandom'
require 'sinatra/base' require 'sinatra/base'
require 'swagger/blocks' require 'swagger/blocks'
require 'sysrandom/securerandom'
require 'warden' require 'warden'
require 'msf/core/rpc' require 'msf/core/rpc'
require 'msf/core/web_services/authentication' require 'msf/core/web_services/authentication'

View File

@ -1,6 +1,6 @@
require 'securerandom'
require 'sinatra/base' require 'sinatra/base'
require 'swagger/blocks' require 'swagger/blocks'
require 'sysrandom/securerandom'
require 'warden' require 'warden'
require 'msf/core/web_services/authentication' require 'msf/core/web_services/authentication'
require 'msf/core/web_services/servlet_helper' require 'msf/core/web_services/servlet_helper'

View File

@ -103,7 +103,6 @@ Gem::Specification.new do |spec|
# Required for msfdb_ws (Metasploit data base as a webservice) # Required for msfdb_ws (Metasploit data base as a webservice)
spec.add_runtime_dependency 'thin' spec.add_runtime_dependency 'thin'
spec.add_runtime_dependency 'sinatra' spec.add_runtime_dependency 'sinatra'
spec.add_runtime_dependency 'sysrandom'
spec.add_runtime_dependency 'warden' spec.add_runtime_dependency 'warden'
# Required for JSON-RPC client # Required for JSON-RPC client
spec.add_runtime_dependency 'em-http-request' spec.add_runtime_dependency 'em-http-request'

2
msfdb
View File

@ -8,7 +8,7 @@ require 'open3'
require 'optparse' require 'optparse'
require 'rex/socket' require 'rex/socket'
require 'rex/text' require 'rex/text'
require 'sysrandom/securerandom' require 'securerandom'
require 'uri' require 'uri'
require 'yaml' require 'yaml'