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

Litter some more rescue nil's in there 

I hate them but they were there when I got there.

A more sane way to deal with this should happen someday.
bug/bundler_fix
Tod Beardsley 2013-10-09 12:17:13 -05:00
parent f95da649f8
commit 356263df56
No known key found for this signature in database
GPG Key ID: 1EFFB682ADB9F193
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/msf/core/auxiliary/jtr.rb
View File

@ -48,7 +48,7 @@ module Auxiliary::JohnTheRipper
when /mingw|cygwin|mswin/ when /mingw|cygwin|mswin/
fname = "#{cpuinfo_base}/cpuinfo.exe" fname = "#{cpuinfo_base}/cpuinfo.exe"
if File.exists?(fname) and File.executable?(fname) if File.exists?(fname) and File.executable?(fname)
data = %x{"#{fname}"} data = %x{"#{fname}"} rescue nil
end end
case data case data
when /sse2/ when /sse2/
@ -62,7 +62,7 @@ module Auxiliary::JohnTheRipper
fname = "#{cpuinfo_base}/cpuinfo.ia64.bin" fname = "#{cpuinfo_base}/cpuinfo.ia64.bin"
if File.exists? fname if File.exists? fname
::FileUtils.chmod(0755, fname) rescue nil ::FileUtils.chmod(0755, fname) rescue nil
data = %x{"#{fname}"} data = %x{"#{fname}"} rescue nil
end end
case data case data
when /mmx/ when /mmx/
@ -74,7 +74,7 @@ module Auxiliary::JohnTheRipper
fname = "#{cpuinfo_base}/cpuinfo.ia32.bin" fname = "#{cpuinfo_base}/cpuinfo.ia32.bin"
if File.exists? fname if File.exists? fname
::FileUtils.chmod(0755, fname) rescue nil ::FileUtils.chmod(0755, fname) rescue nil
data = %x{"#{fname}"} data = %x{"#{fname}"} rescue nil
end end
case data case data
when /sse2/ when /sse2/