From 3bf08290a468dfc3635dcc956daf431b5cd3ae1a Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 3 May 2016 12:37:10 +0200
Subject: [PATCH] Update for an Issue #1836

---
 lib/core/optiondict.py |  4 ++--
 lib/core/settings.py   |  2 +-
 lib/parse/cmdline.py   | 12 ++++++------
 sqlmap.conf            |  9 ++++++---
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index 1689f4be3..e73c4c978 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -136,6 +136,8 @@ optDict = {
                                "tbl":               "string",
                                "col":               "string",
                                "excludeCol":        "string",
+                               "pivotColumn":       "string",
+                               "binaryFields":      "string",
                                "dumpWhere":         "string",
                                "user":              "string",
                                "excludeSysDbs":     "boolean",
@@ -201,7 +203,6 @@ optDict = {
                                "hexConvert":        "boolean",
                                "outputDir":         "string",
                                "parseErrors":       "boolean",
-                               "pivotColumn":       "string",
                                "saveConfig":        "string",
                                "scope":             "string",
                                "testFilter":        "string",
@@ -228,7 +229,6 @@ optDict = {
             "Hidden": {
                                "dummy":             "boolean",
                                "disablePrecon":     "boolean",
-                               "binaryFields":      "string",
                                "profile":           "boolean",
                                "forceDns":          "boolean",
                                "identifyWaf":       "boolean",
diff --git a/lib/core/settings.py b/lib/core/settings.py
index bbf8b4168..eb603657e 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -19,7 +19,7 @@ from lib.core.enums import OS
 from lib.core.revision import getRevisionNumber
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.0.5.6"
+VERSION = "1.0.5.7"
 REVISION = getRevisionNumber()
 STABLE = VERSION.count('.') <= 2
 VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 2d367e9fd..58d0cdc8a 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -464,6 +464,12 @@ def cmdLineParser(argv=None):
                                help="Exclude DBMS system databases when "
                                     "enumerating tables")
 
+        enumeration.add_option("--binary-fields", dest="binaryFields",
+                          help="Result fields having binary values (e.g. \"digest\")")
+
+        enumeration.add_option("--pivot-column", dest="pivotColumn",
+                               help="Pivot column name")
+
         enumeration.add_option("--where", dest="dumpWhere",
                                help="Use WHERE condition while table dumping")
 
@@ -662,9 +668,6 @@ def cmdLineParser(argv=None):
                                   action="store_true",
                                   help="Parse and display DBMS error messages from responses")
 
-        general.add_option("--pivot-column", dest="pivotColumn",
-                               help="Pivot column name")
-
         general.add_option("--save", dest="saveConfig",
                             help="Save options to a configuration INI file")
 
@@ -760,9 +763,6 @@ def cmdLineParser(argv=None):
         parser.add_option("--profile", dest="profile", action="store_true",
                           help=SUPPRESS_HELP)
 
-        parser.add_option("--binary-fields", dest="binaryFields",
-                          help=SUPPRESS_HELP)
-
         parser.add_option("--force-dns", dest="forceDns", action="store_true",
                           help=SUPPRESS_HELP)
 
diff --git a/sqlmap.conf b/sqlmap.conf
index fb0e00185..8299885bd 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -482,6 +482,12 @@ col =
 # Back-end database management system database table column(s) to not enumerate.
 excludeCol = 
 
+# Result fields having binary values (e.g. "digest").
+binaryFields =
+
+# Pivot column name.
+pivotColumn =
+
 # Use WHERE condition while table dumping (e.g. "id=1").
 dumpWhere = 
 
@@ -697,9 +703,6 @@ outputDir =
 # Valid: True or False
 parseErrors = False
 
-# Pivot column name.
-pivotColumn =
-
 # Regular expression for filtering targets from provided Burp.
 # or WebScarab proxy log.
 # Example: (google|yahoo)