removed unuseful prints

This commit is contained in:
Bernardo Damele 2012-12-17 13:29:19 +00:00
parent ac44cf3ec0
commit 0500712a03
2 changed files with 7 additions and 7 deletions

View File

@ -615,13 +615,15 @@ def _setMetasploit():
if not conf.msfPath: if not conf.msfPath:
def _(key, value): def _(key, value):
retVal = None retVal = None
try: try:
from _winreg import ConnectRegistry, OpenKey, QueryValueEx, HKEY_LOCAL_MACHINE from _winreg import ConnectRegistry, OpenKey, QueryValueEx, HKEY_LOCAL_MACHINE
_ = ConnectRegistry(None, HKEY_LOCAL_MACHINE) _ = ConnectRegistry(None, HKEY_LOCAL_MACHINE)
_ = OpenKey(_, key) _ = OpenKey(_, key)
retVal = QueryValueEx(_, value)[0] retVal = QueryValueEx(_, value)[0]
except Exception, ex: except Exception:
print ex logger.debug("unable to identify Metasploit installation path via registry key")
return retVal return retVal
conf.msfPath = _(r"SOFTWARE\Rapid7\Metasploit", "Location") conf.msfPath = _(r"SOFTWARE\Rapid7\Metasploit", "Location")

View File

@ -500,8 +500,7 @@ def _bruteProcessVariantA(attack_info, hash_regex, suffix, retVal, proc_id, proc
except (UnicodeEncodeError, UnicodeDecodeError): except (UnicodeEncodeError, UnicodeDecodeError):
pass # ignore possible encoding problems caused by some words in custom dictionaries pass # ignore possible encoding problems caused by some words in custom dictionaries
except Exception, ex: except Exception, e:
print ex
warnMsg = "there was a problem while hashing entry: %s. " % repr(word) warnMsg = "there was a problem while hashing entry: %s. " % repr(word)
warnMsg += "Please report by e-mail to %s" % ML warnMsg += "Please report by e-mail to %s" % ML
logger.critical(warnMsg) logger.critical(warnMsg)
@ -568,9 +567,8 @@ def _bruteProcessVariantB(user, hash_, kwargs, hash_regex, suffix, retVal, found
except (UnicodeEncodeError, UnicodeDecodeError): except (UnicodeEncodeError, UnicodeDecodeError):
pass # ignore possible encoding problems caused by some words in custom dictionaries pass # ignore possible encoding problems caused by some words in custom dictionaries
except Exception, ex: except Exception, e:
print ex warnMsg = "there was a problem while hashing entry: %s (%s). " % (repr(word), e)
warnMsg = "there was a problem while hashing entry: %s. " % repr(word)
warnMsg += "Please report by e-mail to %s" % ML warnMsg += "Please report by e-mail to %s" % ML
logger.critical(warnMsg) logger.critical(warnMsg)