Merge remote-tracking branch 'upstream/master'

2 files changed, 0 insertions, 19 deletions

diff --git a/test/tools/getcert b/test/tools/getcert
index 6447ecc7..8fabefb7 100755
--- a/test/tools/getcert
+++ b/test/tools/getcert
@@ -5,5 +5,3 @@ import socket, tempfile, ssl, subprocess
 
 addr = socket.gethostbyname(sys.argv[1])
 print ssl.get_server_certificate((addr, 443))
-
-
diff --git a/test/tools/getcn b/test/tools/getcn
deleted file mode 100755
index 212977c3..00000000
--- a/test/tools/getcn
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-import sys
-sys.path.insert(0, "../../")
-from libmproxy import certutils
-
-if len(sys.argv) > 2:
-    port = int(sys.argv[2])
-else:
-    pport = 443
-
-cn, san = certutils.get_remote_cn(sys.argv[1], port)
-print cn
-if san:
-    for i in san:
-        print "\t", i
-
-