summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2015-02-19 19:14:13 +0100
committerLinus Nordberg <linus@nordberg.se>2015-02-20 14:12:48 +0100
commit8fa65d708aa1bb44609c2fdc755520e21328b175 (patch)
treeacab76c419b1e0cba4a02abb068289dcd2541a47
parent74a4460cba73877830b73742be76cd2bf0d5f47b (diff)
Move public keys to separate file
-rw-r--r--tools/certkeys.py14
-rw-r--r--tools/certtools.py15
2 files changed, 15 insertions, 14 deletions
diff --git a/tools/certkeys.py b/tools/certkeys.py
new file mode 100644
index 0000000..3c459e9
--- /dev/null
+++ b/tools/certkeys.py
@@ -0,0 +1,14 @@
+
+publickeys = {
+ "https://ct.googleapis.com/pilot/":
+ "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfahLEimAoz2t01p3uMziiLOl/fHTD"
+ "M0YDOhBRuiBARsV4UvxG2LdNgoIGLrtCzWE0J5APC2em4JlvR8EEEFMoA==",
+
+ "https://127.0.0.1:8080/":
+ "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4qWq6afhBUi0OdcWUYhyJLNXTkGqQ9"
+ "PMS5lqoCgkV2h1ZvpNjBH2u8UbgcOQwqDo66z6BWQJGolozZYmNHE2kQ==",
+
+ "https://flimsy.ct.nordu.net/":
+ "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4qWq6afhBUi0OdcWUYhyJLNXTkGqQ9"
+ "PMS5lqoCgkV2h1ZvpNjBH2u8UbgcOQwqDo66z6BWQJGolozZYmNHE2kQ==",
+}
diff --git a/tools/certtools.py b/tools/certtools.py
index 5b556cf..11e09bb 100644
--- a/tools/certtools.py
+++ b/tools/certtools.py
@@ -13,20 +13,7 @@ import ecdsa
import datetime
import cStringIO
import zipfile
-
-publickeys = {
- "https://ct.googleapis.com/pilot/":
- "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfahLEimAoz2t01p3uMziiLOl/fHTD"
- "M0YDOhBRuiBARsV4UvxG2LdNgoIGLrtCzWE0J5APC2em4JlvR8EEEFMoA==",
-
- "https://127.0.0.1:8080/":
- "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4qWq6afhBUi0OdcWUYhyJLNXTkGqQ9"
- "PMS5lqoCgkV2h1ZvpNjBH2u8UbgcOQwqDo66z6BWQJGolozZYmNHE2kQ==",
-
- "https://flimsy.ct.nordu.net/":
- "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4qWq6afhBUi0OdcWUYhyJLNXTkGqQ9"
- "PMS5lqoCgkV2h1ZvpNjBH2u8UbgcOQwqDo66z6BWQJGolozZYmNHE2kQ==",
-}
+from certkeys import publickeys
def get_cert_info(s):
p = subprocess.Popen(