aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2017-06-12 11:15:37 +0200
committerGitHub <noreply@github.com>2017-06-12 11:15:37 +0200
commit2ceefe9582bd72778648d4f5a154e4d492716b80 (patch)
tree8caf4736657f273fc59ec103393e27eaebe0f51a
parentc89d076cf3aabd44bec9eb092e1dbab953c125b4 (diff)
parentbd9d0bf6b1bd01ee989a729278e64b73de13ccfc (diff)
downloadmitmproxy-2ceefe9582bd72778648d4f5a154e4d492716b80.tar.gz
mitmproxy-2ceefe9582bd72778648d4f5a154e4d492716b80.tar.bz2
mitmproxy-2ceefe9582bd72778648d4f5a154e4d492716b80.zip
Merge pull request #2390 from ograff/remove_private_key_pkcs12
Remove private key from PKCS12 file
-rw-r--r--mitmproxy/certs.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/mitmproxy/certs.py b/mitmproxy/certs.py
index 618b34de..0e441efe 100644
--- a/mitmproxy/certs.py
+++ b/mitmproxy/certs.py
@@ -266,6 +266,12 @@ class CertStore:
with open(os.path.join(path, basename + "-ca-cert.p12"), "wb") as f:
p12 = OpenSSL.crypto.PKCS12()
p12.set_certificate(ca)
+ f.write(p12.export())
+
+ # Dump the certificate and key in a PKCS12 format for Windows devices
+ with open(os.path.join(path, basename + "-ca.p12"), "wb") as f:
+ p12 = OpenSSL.crypto.PKCS12()
+ p12.set_certificate(ca)
p12.set_privatekey(key)
f.write(p12.export())