minor update

stamparm · stamparm · commit f39170a2c4c8 · 2011-11-22T15:06:51.000Z
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -258,25 +258,25 @@ def getChar(idx, charTbl=asciiTbl, continuousOrder=True, expand=charsetType is N
 
                         if retVal in originalTbl or (retVal == ord('\n') and CHAR_INFERENCE_MARK in payload):
                             if timeBasedCompare and not validateChar(idx, retVal):
-                                errMsg = "invalid character detected. retrying.."
-                                logger.error(errMsg)
-
                                 if not kb.originalTimeDelay:
                                     kb.originalTimeDelay = conf.timeSec
 
-                                conf.timeSec += 1
-                                if (conf.timeSec - kb.originalTimeDelay) <= MAX_TIME_REVALIDATION_STEPS:
+                                if (conf.timeSec - kb.originalTimeDelay) < MAX_TIME_REVALIDATION_STEPS:
+                                    errMsg = "invalid character detected. retrying.."
+                                    logger.error(errMsg)
+
                                     warnMsg = "increasing time delay to %d second%s " % (conf.timeSec, 's' if conf.timeSec > 1 else '')
-                                    warnMsg += "(due to invalid char)"
                                     logger.warn(warnMsg)
 
+                                    conf.timeSec += 1
+
                                     if kb.adjustTimeDelay:
                                         dbgMsg = "turning off auto-adjustment mechanism"
                                         logger.debug(dbgMsg)
                                         kb.adjustTimeDelay = False
                                     return getChar(idx, originalTbl, continuousOrder, expand)
                                 else:
-                                    errMsg = "unable to properly validate character value. using last known value ('%s').." % decodeIntToUnicode(retVal)
+                                    errMsg = "unable to properly validate last character value ('%s').." % decodeIntToUnicode(retVal)
                                     logger.error(errMsg)
                                     conf.timeSec = kb.originalTimeDelay
                                     return decodeIntToUnicode(retVal)
