aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/certutils.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-01-30 20:07:30 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-01-30 20:07:30 +0100
commitff9656be80192ac837cf98997f9fe6c00c9c5a32 (patch)
tree1f8a1f8c823770323a4a3e2a9e5fe56add6210b7 /netlib/certutils.py
parente18ac4b672e8645388dc8057801092ce417f1511 (diff)
downloadmitmproxy-ff9656be80192ac837cf98997f9fe6c00c9c5a32.tar.gz
mitmproxy-ff9656be80192ac837cf98997f9fe6c00c9c5a32.tar.bz2
mitmproxy-ff9656be80192ac837cf98997f9fe6c00c9c5a32.zip
remove subclassing of tuple in tcp.Address, move StateObject into netlib
Diffstat (limited to 'netlib/certutils.py')
-rw-r--r--netlib/certutils.py12
1 files changed, 11 insertions, 1 deletions
diff --git a/netlib/certutils.py b/netlib/certutils.py
index 94294f6e..139203b9 100644
--- a/netlib/certutils.py
+++ b/netlib/certutils.py
@@ -3,6 +3,7 @@ from pyasn1.type import univ, constraint, char, namedtype, tag
from pyasn1.codec.der.decoder import decode
from pyasn1.error import PyAsn1Error
import OpenSSL
+from netlib.stateobject import StateObject
import tcp
default_exp = 62208000 # =24 * 60 * 60 * 720
@@ -152,13 +153,22 @@ class _GeneralNames(univ.SequenceOf):
sizeSpec = univ.SequenceOf.sizeSpec + constraint.ValueSizeConstraint(1, 1024)
-class SSLCert:
+class SSLCert(StateObject):
def __init__(self, cert):
"""
Returns a (common name, [subject alternative names]) tuple.
"""
self.x509 = cert
+ def _get_state(self):
+ return self.to_pem()
+
+ def _load_state(self, state):
+ self.x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, state)
+
+ def _from_state(cls, state):
+ return cls.from_pem(state)
+
@classmethod
def from_pem(klass, txt):
x509 = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, txt)