Bug fix for --hex/--technique=B (especially MsSQL)

stamparm · stamparm · commit 25a507328121 · 2012-10-28T12:22:33.000+01:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -1260,7 +1260,9 @@ def getCharset(charsetType=None):
         asciiTbl.extend([0, 1])
         asciiTbl.extend(xrange(47, 58))
         asciiTbl.extend(xrange(64, 71))
+        asciiTbl.extend([87, 88])  # X
         asciiTbl.extend(xrange(96, 103))
+        asciiTbl.extend([119, 120])  # x
 
     # Characters
     elif charsetType == CHARSET_TYPE.ALPHA:
diff --git a/lib/request/inject.py b/lib/request/inject.py
@@ -366,6 +366,9 @@ def getValue(expression, blind=True, union=True, error=True, time=True, fromUser
     affected parameter.
     """
 
+    if conf.hexConvert:
+        charsetType = CHARSET_TYPE.HEXADECIMAL
+
     kb.safeCharEncode = safeCharEncode
     kb.resumeValues = resumeValue
 
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -308,7 +308,7 @@ def getChar(idx, charTbl=None, continuousOrder=True, expand=charsetType is None,
                                             dbgMsg = "turning back on time auto-adjustment mechanism"
                                             logger.debug(dbgMsg)
                                             kb.adjustTimeDelay = ADJUST_TIME_DELAY.YES
-                                    
+
                                     return decodeIntToUnicode(retVal)
                             else:
                                 return None
