Use PyOpenSSL and PyASN1 for certificate parsing.

Yes, these are two more major dependencies for mitmproxy, but if we're going to
do all the cool things I want to do with SSL certs, there is no other way.

2 files changed, 9 insertions, 20 deletions

diff --git a/test/tools/getcert b/test/tools/getcert
index dc655958..6447ecc7 100755
--- a/test/tools/getcert
+++ b/test/tools/getcert
@@ -4,21 +4,6 @@ sys.path.insert(0, "../..")
 import socket, tempfile, ssl, subprocess
 
 addr = socket.gethostbyname(sys.argv[1])
-s = ssl.get_server_certificate((addr, 443))
-f = tempfile.NamedTemporaryFile()
-f.write(s)
-f.flush()
-p = subprocess.Popen(
-    [
-        "openssl",
-        "x509",
-        "-in", f.name,
-        "-text",
-        "-noout"
-    ],
-    stdout = subprocess.PIPE
-)
-out, _ = p.communicate()
-print out
+print ssl.get_server_certificate((addr, 443))
 
 
diff --git a/test/tools/getcn b/test/tools/getcn
index 4cc028ca..212977c3 100755
--- a/test/tools/getcn
+++ b/test/tools/getcn
@@ -1,10 +1,14 @@
 #!/usr/bin/env python
-
 import sys
-sys.path.insert(0, "../..")
-from libmproxy import utils
+sys.path.insert(0, "../../")
+from libmproxy import certutils
+
+if len(sys.argv) > 2:
+    port = int(sys.argv[2])
+else:
+    pport = 443
 
-cn, san = utils.get_remote_cn(sys.argv[1], 443)
+cn, san = certutils.get_remote_cn(sys.argv[1], port)
 print cn
 if san:
     for i in san: