mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2024-11-22 01:26:42 +03:00
Minor removal of blank lines
This commit is contained in:
parent
d9d0865c13
commit
03be9f9b65
|
@ -19,7 +19,7 @@ from lib.core.enums import OS
|
||||||
from lib.core.revision import getRevisionNumber
|
from lib.core.revision import getRevisionNumber
|
||||||
|
|
||||||
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
|
||||||
VERSION = "1.0.5.31"
|
VERSION = "1.0.5.32"
|
||||||
REVISION = getRevisionNumber()
|
REVISION = getRevisionNumber()
|
||||||
STABLE = VERSION.count('.') <= 2
|
STABLE = VERSION.count('.') <= 2
|
||||||
VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
|
VERSION_STRING = "sqlmap/%s#%s" % (VERSION, "stable" if STABLE else "dev")
|
||||||
|
|
2
thirdparty/bottle/bottle.py
vendored
2
thirdparty/bottle/bottle.py
vendored
|
@ -95,7 +95,7 @@ try:
|
||||||
return (args, varargs, keywords, tuple(defaults) or None)
|
return (args, varargs, keywords, tuple(defaults) or None)
|
||||||
except ImportError:
|
except ImportError:
|
||||||
from inspect import getargspec
|
from inspect import getargspec
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from simplejson import dumps as json_dumps, loads as json_lds
|
from simplejson import dumps as json_dumps, loads as json_lds
|
||||||
except ImportError: # pragma: no cover
|
except ImportError: # pragma: no cover
|
||||||
|
|
12
thirdparty/pydes/pyDes.py
vendored
12
thirdparty/pydes/pyDes.py
vendored
|
@ -59,7 +59,7 @@ pad -> Optional argument. Only when using padmode of PAD_NORMAL. For
|
||||||
bytes of the unencrypted data block.
|
bytes of the unencrypted data block.
|
||||||
padmode -> Optional argument, set the padding mode, must be one of PAD_NORMAL
|
padmode -> Optional argument, set the padding mode, must be one of PAD_NORMAL
|
||||||
or PAD_PKCS5). Defaults to PAD_NORMAL.
|
or PAD_PKCS5). Defaults to PAD_NORMAL.
|
||||||
|
|
||||||
|
|
||||||
Example
|
Example
|
||||||
-------
|
-------
|
||||||
|
@ -153,7 +153,7 @@ class _baseDes(object):
|
||||||
def getPadMode(self):
|
def getPadMode(self):
|
||||||
"""getPadMode() -> pyDes.PAD_NORMAL or pyDes.PAD_PKCS5"""
|
"""getPadMode() -> pyDes.PAD_NORMAL or pyDes.PAD_PKCS5"""
|
||||||
return self._padmode
|
return self._padmode
|
||||||
|
|
||||||
def setPadMode(self, mode):
|
def setPadMode(self, mode):
|
||||||
"""Sets the type of padding mode, pyDes.PAD_NORMAL or pyDes.PAD_PKCS5"""
|
"""Sets the type of padding mode, pyDes.PAD_NORMAL or pyDes.PAD_PKCS5"""
|
||||||
self._padmode = mode
|
self._padmode = mode
|
||||||
|
@ -188,7 +188,7 @@ class _baseDes(object):
|
||||||
if not pad:
|
if not pad:
|
||||||
raise ValueError("Data must be a multiple of " + str(self.block_size) + " bytes in length. Use padmode=PAD_PKCS5 or set the pad character.")
|
raise ValueError("Data must be a multiple of " + str(self.block_size) + " bytes in length. Use padmode=PAD_PKCS5 or set the pad character.")
|
||||||
data += (self.block_size - (len(data) % self.block_size)) * pad
|
data += (self.block_size - (len(data) % self.block_size)) * pad
|
||||||
|
|
||||||
elif padmode == PAD_PKCS5:
|
elif padmode == PAD_PKCS5:
|
||||||
pad_len = 8 - (len(data) % self.block_size)
|
pad_len = 8 - (len(data) % self.block_size)
|
||||||
if _pythonMajorVersion < 3:
|
if _pythonMajorVersion < 3:
|
||||||
|
@ -454,7 +454,7 @@ class des(_baseDes):
|
||||||
def __permutate(self, table, block):
|
def __permutate(self, table, block):
|
||||||
"""Permutate this block with the specified table"""
|
"""Permutate this block with the specified table"""
|
||||||
return list(map(lambda x: block[x], table))
|
return list(map(lambda x: block[x], table))
|
||||||
|
|
||||||
# Transform the secret key, so that it is ready for data processing
|
# Transform the secret key, so that it is ready for data processing
|
||||||
# Create the 16 subkeys, K[1] - K[16]
|
# Create the 16 subkeys, K[1] - K[16]
|
||||||
def __create_sub_keys(self):
|
def __create_sub_keys(self):
|
||||||
|
@ -554,7 +554,7 @@ class des(_baseDes):
|
||||||
|
|
||||||
i += 1
|
i += 1
|
||||||
iteration += iteration_adjustment
|
iteration += iteration_adjustment
|
||||||
|
|
||||||
# Final permutation of R[16]L[16]
|
# Final permutation of R[16]L[16]
|
||||||
self.final = self.__permutate(des.__fp, self.R + self.L)
|
self.final = self.__permutate(des.__fp, self.R + self.L)
|
||||||
return self.final
|
return self.final
|
||||||
|
@ -597,7 +597,7 @@ class des(_baseDes):
|
||||||
# result.append(dict[data[i:i+8]])
|
# result.append(dict[data[i:i+8]])
|
||||||
# i += 8
|
# i += 8
|
||||||
# continue
|
# continue
|
||||||
|
|
||||||
block = self.__String_to_BitList(data[i:i+8])
|
block = self.__String_to_BitList(data[i:i+8])
|
||||||
|
|
||||||
# Xor with IV if using CBC mode
|
# Xor with IV if using CBC mode
|
||||||
|
|
22
thirdparty/xdot/xdot.py
vendored
22
thirdparty/xdot/xdot.py
vendored
|
@ -522,7 +522,7 @@ class XDotAttrParser:
|
||||||
self.parser = parser
|
self.parser = parser
|
||||||
self.buf = buf
|
self.buf = buf
|
||||||
self.pos = 0
|
self.pos = 0
|
||||||
|
|
||||||
self.pen = Pen()
|
self.pen = Pen()
|
||||||
self.shapes = []
|
self.shapes = []
|
||||||
|
|
||||||
|
@ -616,7 +616,7 @@ class XDotAttrParser:
|
||||||
b = b*s
|
b = b*s
|
||||||
a = 1.0
|
a = 1.0
|
||||||
return r, g, b, a
|
return r, g, b, a
|
||||||
|
|
||||||
sys.stderr.write("warning: unknown color '%s'\n" % c)
|
sys.stderr.write("warning: unknown color '%s'\n" % c)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
@ -691,7 +691,7 @@ class XDotAttrParser:
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
return self.shapes
|
return self.shapes
|
||||||
|
|
||||||
def transform(self, x, y):
|
def transform(self, x, y):
|
||||||
return self.parser.transform(x, y)
|
return self.parser.transform(x, y)
|
||||||
|
|
||||||
|
@ -763,7 +763,7 @@ class ParseError(Exception):
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return ':'.join([str(part) for part in (self.filename, self.line, self.col, self.msg) if part != None])
|
return ':'.join([str(part) for part in (self.filename, self.line, self.col, self.msg) if part != None])
|
||||||
|
|
||||||
|
|
||||||
class Scanner:
|
class Scanner:
|
||||||
"""Stateless scanner."""
|
"""Stateless scanner."""
|
||||||
|
@ -1007,7 +1007,7 @@ class DotLexer(Lexer):
|
||||||
text = text.replace('\\\r\n', '')
|
text = text.replace('\\\r\n', '')
|
||||||
text = text.replace('\\\r', '')
|
text = text.replace('\\\r', '')
|
||||||
text = text.replace('\\\n', '')
|
text = text.replace('\\\n', '')
|
||||||
|
|
||||||
# quotes
|
# quotes
|
||||||
text = text.replace('\\"', '"')
|
text = text.replace('\\"', '"')
|
||||||
|
|
||||||
|
@ -1151,7 +1151,7 @@ class XDotParser(DotParser):
|
||||||
def __init__(self, xdotcode):
|
def __init__(self, xdotcode):
|
||||||
lexer = DotLexer(buf = xdotcode)
|
lexer = DotLexer(buf = xdotcode)
|
||||||
DotParser.__init__(self, lexer)
|
DotParser.__init__(self, lexer)
|
||||||
|
|
||||||
self.nodes = []
|
self.nodes = []
|
||||||
self.edges = []
|
self.edges = []
|
||||||
self.shapes = []
|
self.shapes = []
|
||||||
|
@ -1188,7 +1188,7 @@ class XDotParser(DotParser):
|
||||||
self.height = max(ymax - ymin, 1)
|
self.height = max(ymax - ymin, 1)
|
||||||
|
|
||||||
self.top_graph = False
|
self.top_graph = False
|
||||||
|
|
||||||
for attr in ("_draw_", "_ldraw_", "_hdraw_", "_tdraw_", "_hldraw_", "_tldraw_"):
|
for attr in ("_draw_", "_ldraw_", "_hdraw_", "_tdraw_", "_hldraw_", "_tldraw_"):
|
||||||
if attr in attrs:
|
if attr in attrs:
|
||||||
parser = XDotAttrParser(self, attrs[attr])
|
parser = XDotAttrParser(self, attrs[attr])
|
||||||
|
@ -1219,7 +1219,7 @@ class XDotParser(DotParser):
|
||||||
pos = attrs['pos']
|
pos = attrs['pos']
|
||||||
except KeyError:
|
except KeyError:
|
||||||
return
|
return
|
||||||
|
|
||||||
points = self.parse_edge_pos(pos)
|
points = self.parse_edge_pos(pos)
|
||||||
shapes = []
|
shapes = []
|
||||||
for attr in ("_draw_", "_ldraw_", "_hdraw_", "_tdraw_", "_hldraw_", "_tldraw_"):
|
for attr in ("_draw_", "_ldraw_", "_hdraw_", "_tdraw_", "_hldraw_", "_tldraw_"):
|
||||||
|
@ -1987,7 +1987,7 @@ class DotWindow(gtk.Window):
|
||||||
if not entry_text:
|
if not entry_text:
|
||||||
dot_widget.set_highlight(None)
|
dot_widget.set_highlight(None)
|
||||||
return
|
return
|
||||||
|
|
||||||
found_items = self.find_text(entry_text)
|
found_items = self.find_text(entry_text)
|
||||||
dot_widget.set_highlight(found_items)
|
dot_widget.set_highlight(found_items)
|
||||||
|
|
||||||
|
@ -1997,7 +1997,7 @@ class DotWindow(gtk.Window):
|
||||||
if not entry_text:
|
if not entry_text:
|
||||||
dot_widget.set_highlight(None)
|
dot_widget.set_highlight(None)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
found_items = self.find_text(entry_text)
|
found_items = self.find_text(entry_text)
|
||||||
dot_widget.set_highlight(found_items)
|
dot_widget.set_highlight(found_items)
|
||||||
if(len(found_items) == 1):
|
if(len(found_items) == 1):
|
||||||
|
@ -2015,7 +2015,7 @@ class DotWindow(gtk.Window):
|
||||||
if self.widget.set_xdotcode(xdotcode):
|
if self.widget.set_xdotcode(xdotcode):
|
||||||
self.update_title(filename)
|
self.update_title(filename)
|
||||||
self.widget.zoom_to_fit()
|
self.widget.zoom_to_fit()
|
||||||
|
|
||||||
def update_title(self, filename=None):
|
def update_title(self, filename=None):
|
||||||
if filename is None:
|
if filename is None:
|
||||||
self.set_title(self.base_title)
|
self.set_title(self.base_title)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user