Moving --force-ssl from [Request] to [General] options

stamparm · stamparm · commit 4b5335a323bd · 2013-04-02T17:18:21.000+02:00
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
@@ -30,7 +30,6 @@
                                "agent":             "string",
                                "randomAgent":       "boolean",
                                "rParam":            "string",
-                               "forceSSL":          "boolean",
                                "host":              "string",
                                "referer":           "string",
                                "headers":           "string",
@@ -179,6 +178,7 @@
                                "dumpFormat":        "string",
                                "eta":               "boolean",
                                "flushSession":      "boolean",
+                               "forceSSL":          "boolean",
                                "forms":             "boolean",
                                "freshQueries":      "boolean",
                                "hexConvert":        "boolean",
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
@@ -100,10 +100,6 @@ def cmdLineParser():
         request.add_option("--randomize", dest="rParam",
                            help="Randomly change value for given parameter(s)")
 
-        request.add_option("--force-ssl", dest="forceSSL",
-                           action="store_true",
-                           help="Force usage of SSL/HTTPS requests")
-
         request.add_option("--host", dest="host",
                            help="HTTP Host header")
 
@@ -568,6 +564,10 @@ def cmdLineParser():
                             action="store_true",
                             help="Flush session files for current target")
 
+        general.add_option("--force-ssl", dest="forceSSL",
+                           action="store_true",
+                           help="Force usage of SSL/HTTPS requests")
+
         general.add_option("--forms", dest="forms",
                                   action="store_true",
                                   help="Parse and test forms on target URL")
diff --git a/sqlmap.conf b/sqlmap.conf
@@ -68,10 +68,6 @@ referer =
 # Randomly change value for the given parameter
 rParam = 
 
-# Force usage of SSL/HTTPS requests
-# Valid: True or False
-forceSSL = False
-
 # Extra HTTP headers
 headers = Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
  Accept-Language: en-us,en;q=0.5
@@ -618,6 +614,10 @@ eta = False
 # Valid: True or False
 flushSession = False
 
+# Force usage of SSL/HTTPS requests
+# Valid: True or False
+forceSSL = False
+
 # Parse and test forms on target URL.
 # Valid: True or False
 forms = False
