From f4b8a3c1d8ea07b63fb70bf8bdc0196335b04f6e Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 4 Feb 2013 15:49:29 +0100 Subject: [PATCH] Bug fix for boolean (multithreaded Ctrl+C) resumed values --- lib/core/settings.py | 2 +- lib/techniques/blind/inference.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index 50d410ba3..b7df68464 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -43,7 +43,7 @@ ASTERISK_MARKER = "__ASTERISK_MARK__" PAYLOAD_DELIMITER = "\x00" CHAR_INFERENCE_MARK = "%c" -PRINTABLE_CHAR_REGEX = r"[^\x00-\x1f\x7e-\xff]" +PRINTABLE_CHAR_REGEX = r"[^\x00-\x1f\x7f-\xff]" # Regular expression used for recognition of generic permission messages PERMISSION_DENIED_REGEX = r"(command|permission|access)\s*(was|is)?\s*denied" diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py index 9a69cc90c..4fd99bbb3 100644 --- a/lib/techniques/blind/inference.py +++ b/lib/techniques/blind/inference.py @@ -444,7 +444,8 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None abortedFlag = True finally: - value = [partialValue[_] if _ < len(partialValue) else threadData.shared.value[_] for _ in xrange(length)] + value = [_ for _ in partialValue] + value.extend(_ for _ in threadData.shared.value) infoMsg = None