Skip to content

Commit 772eaa2

Browse files
committed
Minor patch
1 parent efd5e2b commit 772eaa2

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

data/txt/sha256sums.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ c6a182f6b7d3b0ad6f0888ea2a4de4148f0770549038d7de8bc3267b4c6635f7 lib/core/readl
188188
63ae69713c6ea9abfa10e71dfab8f2dcf42432177a38d2c1e98785bf1468674c lib/core/replication.py
189189
5bad5bc7115051cef7b84efa73fbafbf5e1db46eef32a445056b56cda750b66f lib/core/revision.py
190190
0dcb52c9c76a4b0acf2e9038f7d8f08c14543cef3cf7032831c6c0a99376ad24 lib/core/session.py
191-
a038d8cca1fd8037d99c4b09d2e910c346ed4ca8e6d1ce8648e3e9e4859ae674 lib/core/settings.py
191+
2d6e17f497c09c7a25225e7c669b5c907aec1dac09c9300dd4ad48a325e2a254 lib/core/settings.py
192192
a1e4f2860bffc73bbf2e5db293fa49dcb600ea35f950cda43dc953b3160ab3db lib/core/shell.py
193193
841716e87b90a3b598515910841f7cf8d33bb87c24a27fba1a80e36a831cbcd7 lib/core/subprocessng.py
194194
9731092f195e346716929323ea3c93247b23b9b92b0f32d3fd0acc3adf9876cc lib/core/target.py
@@ -210,11 +210,11 @@ cbabdde72df4bd8d6961d589f1721dd938d8f653aa6af8900a31af6e2586405d lib/parse/site
210210
87109063dd336fe2705fdfef23bc9b340dcc58e410f15c372fab51ea6a1bf4b1 lib/request/basicauthhandler.py
211211
89417568d7f19e48d39a8a9a4227d3d2b71d1c9f61139a41b1835fb5266fcab8 lib/request/basic.py
212212
6139b926a3462d14ddd50acdb8575ae442b8fab089db222721535092b9af3ea1 lib/request/chunkedhandler.py
213-
ad661a075c6df0624747722d77ca3b1f69f36e54708e33673a33cfdef1ed5075 lib/request/comparison.py
213+
6058fc4fce4b5ce660096d341eab3ae170e5406b31e2e9f51dcf60e7a2b67e68 lib/request/comparison.py
214214
7345c12a0a1d4c583766b46ba38263cbc4603a85aa4216deddd62958d4e5d596 lib/request/connect.py
215215
0649a39c5cc2fc0f4c062b100ced17e3e6934a7e578247dfc65b650edc29825e lib/request/direct.py
216216
5283754cf387ce4e645ee50834ee387cde29a768aaada1a6a07c338da216c94d lib/request/dns.py
217-
21d299203a92bc31415811904e1134a0d9e752c5fb111d3ea56605d78724ab3f lib/request/httpshandler.py
217+
844fae318d6b3141bfc817aac7a29868497b5e7b4b3fdd7c751ad1d4a485324f lib/request/httpshandler.py
218218
1d6e741e19e467650dce2ca84aa824d6df68ff74aedbe4afa8dbdb0193d94918 lib/request/__init__.py
219219
64442b90c1e02b23db3ed764a0588f9052b96c4690b234af1682b3b7e52d51a8 lib/request/inject.py
220220
6ac4235e40dda2d51b21c2199374eb30d53a5b40869f80055df0ac34fbe59351 lib/request/methodrequest.py

lib/core/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from thirdparty import six
2020

2121
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
22-
VERSION = "1.9.2.15"
22+
VERSION = "1.9.2.16"
2323
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2424
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2525
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

lib/request/comparison.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def _comparison(page, headers, code, getRatioValue, pageLength):
120120
if isinstance(seqMatcher.a, six.binary_type) and isinstance(page, six.text_type):
121121
page = getBytes(page, kb.pageEncoding or DEFAULT_PAGE_ENCODING, "ignore")
122122
elif isinstance(seqMatcher.a, six.text_type) and isinstance(page, six.binary_type):
123-
seqMatcher.a = getBytes(seqMatcher.a, kb.pageEncoding or DEFAULT_PAGE_ENCODING, "ignore")
123+
seqMatcher.set_seq1(getBytes(seqMatcher.a, kb.pageEncoding or DEFAULT_PAGE_ENCODING, "ignore"))
124124

125125
if any(_ is None for _ in (page, seqMatcher.a)):
126126
return None
@@ -146,12 +146,19 @@ def _comparison(page, headers, code, getRatioValue, pageLength):
146146
if seq1 is None or seq2 is None:
147147
return None
148148

149-
seq1 = seq1.replace(REFLECTED_VALUE_MARKER, "")
150-
seq2 = seq2.replace(REFLECTED_VALUE_MARKER, "")
149+
if isinstance(seq1, six.binary_type):
150+
seq1 = seq1.replace(REFLECTED_VALUE_MARKER.encode(), b"")
151+
elif isinstance(seq1, six.text_type):
152+
seq1 = seq1.replace(REFLECTED_VALUE_MARKER, "")
153+
154+
if isinstance(seq2, six.binary_type):
155+
seq2 = seq2.replace(REFLECTED_VALUE_MARKER.encode(), b"")
156+
elif isinstance(seq2, six.text_type):
157+
seq2 = seq2.replace(REFLECTED_VALUE_MARKER, "")
151158

152159
if kb.heavilyDynamic:
153-
seq1 = seq1.split("\n")
154-
seq2 = seq2.split("\n")
160+
seq1 = seq1.split("\n" if isinstance(seq1, six.text_type) else b"\n")
161+
seq2 = seq2.split("\n" if isinstance(seq2, six.text_type) else b"\n")
155162

156163
key = None
157164
else:

lib/request/httpshandler.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ def create_sock():
7979
try:
8080
# Reference(s): https://askubuntu.com/a/1263098
8181
# https://askubuntu.com/a/1250807
82+
# https://git.zknt.org/mirror/bazarr/commit/7f05f932ffb84ba8b9e5630b2adc34dbd77e2b4a?style=split&whitespace=show-all&show-outdated=
8283
_contexts[protocol].set_ciphers("ALL@SECLEVEL=0")
8384
except (ssl.SSLError, AttributeError):
8485
pass

0 commit comments

Comments
 (0)