infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework-private into staging/electro-release

bug/bundler_fix
David Maloney 2014-06-19 13:24:06 -05:00
parent 2ac2dc9d7a 5815ec96df
commit e34a3b5309
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/net/ssh/key_factory.rb
View File

@ -35,9 +35,9 @@ module Net; module SSH
# appropriately. The new key is returned. If the key itself is # appropriately. The new key is returned. If the key itself is
# encrypted (requiring a passphrase to use), the user will be # encrypted (requiring a passphrase to use), the user will be
# prompted to enter their password unless passphrase works. # prompted to enter their password unless passphrase works.
def load_private_key(filename, passphrase=nil) def load_private_key(filename, passphrase=nil, ask_passphrase=true)
data = File.open(File.expand_path(filename), "rb") {|f| f.read(f.stat.size)} data = File.open(File.expand_path(filename), "rb") {|f| f.read(f.stat.size)}
load_data_private_key(data, passphrase, filename) load_data_private_key(data, passphrase, ask_passphrase, filename)
end end
# Loads a private key. It will correctly determine # Loads a private key. It will correctly determine
@ -45,7 +45,7 @@ module Net; module SSH
# appropriately. The new key is returned. If the key itself is # appropriately. The new key is returned. If the key itself is
# encrypted (requiring a passphrase to use), the user will be # encrypted (requiring a passphrase to use), the user will be
# prompted to enter their password unless passphrase works. # prompted to enter their password unless passphrase works.
def load_data_private_key(data, passphrase=nil, filename="") def load_data_private_key(data, passphrase=nil, ask_passphrase= true, filename="")
if data.match(/-----BEGIN DSA PRIVATE KEY-----/) if data.match(/-----BEGIN DSA PRIVATE KEY-----/)
key_type = OpenSSL::PKey::DSA key_type = OpenSSL::PKey::DSA
elsif data.match(/-----BEGIN RSA PRIVATE KEY-----/) elsif data.match(/-----BEGIN RSA PRIVATE KEY-----/)
@ -62,7 +62,7 @@ module Net; module SSH
begin begin
return key_type.new(data, passphrase || 'invalid') return key_type.new(data, passphrase || 'invalid')
rescue OpenSSL::PKey::RSAError, OpenSSL::PKey::DSAError => e rescue OpenSSL::PKey::RSAError, OpenSSL::PKey::DSAError => e
if encrypted_key if encrypted_key && ask_passphrase
tries += 1 tries += 1
if tries <= 3 if tries <= 3
passphrase = prompt("Enter passphrase for #{filename}:", false) passphrase = prompt("Enter passphrase for #{filename}:", false)