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

Merge branch 'master' into mitmproxy_issue_341

Browse Source
This commit is contained in:
Maximilian Hils 2014-09-04 21:21:03 +02:00
commit c2e74ef95c
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netlib/certutils.py
View File

@ -285,6 +285,9 @@ class SSLCert:
def __eq__(self, other): def __eq__(self, other):
return self.digest("sha1") == other.digest("sha1") return self.digest("sha1") == other.digest("sha1")
def __ne__(self, other):
return not self.__eq__(other)
@classmethod @classmethod
def from_pem(klass, txt): def from_pem(klass, txt):
x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, txt) x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, txt)

3
netlib/odict.py
View File

@ -24,6 +24,9 @@ class ODict:
def __eq__(self, other): def __eq__(self, other):
return self.lst == other.lst return self.lst == other.lst
def __ne__(self, other):
return not self.__eq__(other)
def __iter__(self): def __iter__(self):
return self.lst.__iter__() return self.lst.__iter__()