Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2496 from Kriechi/bump-pyasn

Browse Source 
bump pyasn
This commit is contained in:
Thomas Kriechbaumer 2017-08-02 20:35:50 +02:00 committed by GitHub
commit 70a501e917
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mitmproxy/certs.py
View File

@ -480,10 +480,8 @@ class SSLCert(serializable.Serializable):
except PyAsn1Error: except PyAsn1Error:
continue continue
for i in dec[0]: for i in dec[0]:
if i[0] is None and isinstance(i[1], univ.OctetString) and not isinstance(i[1], char.IA5String): if i[0].hasValue():
# This would give back the IP address: b'.'.join([str(e).encode() for e in i[1].asNumbers()])
continue
else:
e = i[0].asOctets() e = i[0].asOctets()
altnames.append(e) altnames.append(e)
return altnames return altnames

2
setup.py
View File

@ -73,7 +73,7 @@ setup(
"kaitaistruct>=0.7, <0.8", "kaitaistruct>=0.7, <0.8",
"ldap3>=2.2.0, <2.3", "ldap3>=2.2.0, <2.3",
"passlib>=1.6.5, <1.8", "passlib>=1.6.5, <1.8",
"pyasn1>=0.1.9, <0.3", "pyasn1>=0.3.1, <0.4",
"pyOpenSSL>=17.2,<17.3", "pyOpenSSL>=17.2,<17.3",
"pyparsing>=2.1.3, <2.3", "pyparsing>=2.1.3, <2.3",
"pyperclip>=1.5.22, <1.6", "pyperclip>=1.5.22, <1.6",