sqlmapproject/sqlmap
1
1
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-06-13 09:33:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

removed some blank trailing spaces (with extra/shutils/blanks.sh)

Browse Source
This commit is contained in:
Miroslav Stampar 2010-12-21 10:31:56 +00:00
parent 1a3f57e5fe
commit 6b37ddada4
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extra/pydes/pyDes.py
View File

@ -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

4
lib/core/common.py
View File

@ -1558,7 +1558,7 @@ def pushValue(value):
""" """
Push value to the stack (thread dependent) Push value to the stack (thread dependent)
""" """
getCurrentThreadData().valueStack.append(value) getCurrentThreadData().valueStack.append(value)
def popValue(): def popValue():
@ -1761,7 +1761,7 @@ def removeDynamicContent(page):
def filterStringValue(value, regex): def filterStringValue(value, regex):
retVal = "" retVal = ""
if value: if value:
for char in value: for char in value:
if re.search(regex, char): if re.search(regex, char):

2
lib/core/dump.py
View File

@ -172,7 +172,7 @@ class Dump:
self.__write("+%s+\n" % lines) self.__write("+%s+\n" % lines)
else: else:
self.string("tables", dbTables) self.string("tables", dbTables)
def dbTableColumns(self, tableColumns): def dbTableColumns(self, tableColumns):
for db, tables in tableColumns.items(): for db, tables in tableColumns.items():
if not db: if not db:

2
lib/request/connect.py
View File

@ -265,7 +265,7 @@ class Connect:
except (urllib2.URLError, socket.error, socket.timeout, httplib.BadStatusLine, httplib.IncompleteRead), e: except (urllib2.URLError, socket.error, socket.timeout, httplib.BadStatusLine, httplib.IncompleteRead), e:
tbMsg = traceback.format_exc() tbMsg = traceback.format_exc()
if "no host given" in tbMsg: if "no host given" in tbMsg:
warnMsg = "invalid url address used (%s)" % repr(url) warnMsg = "invalid url address used (%s)" % repr(url)
raise sqlmapSyntaxException, warnMsg raise sqlmapSyntaxException, warnMsg

2
lib/techniques/brute/use.py
View File

@ -37,7 +37,7 @@ def tableExists(tableFile):
iolock = threading.Lock() iolock = threading.Lock()
kb.locks.seqLock = threading.Lock() kb.locks.seqLock = threading.Lock()
kb.threadContinue = True kb.threadContinue = True
def tableExistsThread(): def tableExistsThread():
while count[0] < length and kb.threadContinue: while count[0] < length and kb.threadContinue:
tbllock.acquire() tbllock.acquire()

2
plugins/generic/enumeration.py
View File

@ -1271,7 +1271,7 @@ class Enumeration:
conf.col = None conf.col = None
kb.data.cachedDbs = [] kb.data.cachedDbs = []
kb.data.cachedTables = self.getTables() kb.data.cachedTables = self.getTables()
if kb.data.cachedTables: if kb.data.cachedTables:
if isinstance(kb.data.cachedTables, list): if isinstance(kb.data.cachedTables, list):
kb.data.cachedTables = { None : kb.data.cachedTables } kb.data.cachedTables = { None : kb.data.cachedTables }