From caae773b2d9a6ce50ef5681ec1d4b3218f9bb7d3 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 18 Jan 2013 10:44:57 +0100 Subject: [PATCH] Minor removal of redundant code --- lib/core/common.py | 7 ------- plugins/generic/users.py | 5 ++--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 96eb25297..1f9c56102 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -768,13 +768,6 @@ def dataToOutFile(filename, data): return retVal -def strToHex(value): - """ - Converts string value to it's hexadecimal representation - """ - - return (value if not isinstance(value, unicode) else value.encode(UNICODE_ENCODING)).encode("hex").upper() - def readInput(message, default=None, checkBatch=True): """ Reads input from terminal diff --git a/plugins/generic/users.py b/plugins/generic/users.py index d849e0e99..a229b4baf 100644 --- a/plugins/generic/users.py +++ b/plugins/generic/users.py @@ -21,8 +21,8 @@ from lib.core.common import isTechniqueAvailable from lib.core.common import parsePasswordHash from lib.core.common import randomStr from lib.core.common import readInput -from lib.core.common import strToHex from lib.core.common import unArrayizeValue +from lib.core.convert import hexencode from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger @@ -187,7 +187,6 @@ class Users: if retVal: for user, password in filterPairValues(zip(retVal[0]["%s.name" % randStr], retVal[0]["%s.password" % randStr])): - # password = "0x%s" % strToHex(password) if user not in kb.data.cachedUsersPasswords: kb.data.cachedUsersPasswords[user] = [password] else: @@ -229,7 +228,7 @@ class Users: if retVal: for user, password in filterPairValues(zip(retVal[0]["%s.name" % randStr], retVal[0]["%s.password" % randStr])): - password = "0x%s" % strToHex(password) + password = "0x%s" % hexencode(password).upper() if user not in kb.data.cachedUsersPasswords: kb.data.cachedUsersPasswords[user] = [password]