diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-12-29 17:51:11 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-12-29 17:51:11 +0100 |
| commit | 7b093b46b6a8ce98fe3d55de81d9305d966dfcbf (patch) | |
| tree | 6cfb22f7f433b5b4af4079e2e6724f6730ebceb0 /libmproxy/models | |
| parent | 6391b05ef1b92585765eb77e352921ec61b65020 (diff) | |
| parent | 09168e1274b0e33448811c39efa3fbdd2aeff756 (diff) | |
| download | mitmproxy-7b093b46b6a8ce98fe3d55de81d9305d966dfcbf.tar.gz mitmproxy-7b093b46b6a8ce98fe3d55de81d9305d966dfcbf.tar.bz2 mitmproxy-7b093b46b6a8ce98fe3d55de81d9305d966dfcbf.zip | |
Merge pull request #870 from bazzinotti/master
[docs/libmproxy/test] Support single client-side cert file
Diffstat (limited to 'libmproxy/models')
| -rw-r--r-- | libmproxy/models/connections.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libmproxy/models/connections.py b/libmproxy/models/connections.py index 3aa522ea..0991955d 100644 --- a/libmproxy/models/connections.py +++ b/libmproxy/models/connections.py @@ -174,11 +174,14 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject): def establish_ssl(self, clientcerts, sni, **kwargs): clientcert = None if clientcerts: - path = os.path.join( - clientcerts, - self.address.host.encode("idna")) + ".pem" - if os.path.exists(path): - clientcert = path + if os.path.isfile(clientcerts): + clientcert = clientcerts + else: + path = os.path.join( + clientcerts, + self.address.host.encode("idna")) + ".pem" + if os.path.exists(path): + clientcert = path self.convert_to_ssl(cert=clientcert, sni=sni, **kwargs) self.sni = sni |