summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjosef <josef.gson@gmail.com>2015-11-30 09:23:28 +0100
committerjosef <josef.gson@gmail.com>2015-11-30 09:23:28 +0100
commitb5e2b400cf4607760426bf34d03eca84ddec6b5f (patch)
tree75dfa764d35ed2c2f035a21cd12742a9ee0bf1e4
parent0a21ff4c5f14787d06e2f3e78f04c7f696623336 (diff)
bugfix in policy parsing
-rw-r--r--monitor/josef_lib.py19
1 files changed, 13 insertions, 6 deletions
diff --git a/monitor/josef_lib.py b/monitor/josef_lib.py
index 55ec98e..992e230 100644
--- a/monitor/josef_lib.py
+++ b/monitor/josef_lib.py
@@ -11,17 +11,21 @@ import urlparse
import struct
import sys
import hashlib
-import ecdsa
+
import datetime
import cStringIO
import zipfile
import shutil
from copy import deepcopy
-from certkeys import publickeys
-from Crypto.Hash import SHA256
-import Crypto.PublicKey.RSA as RSA
-from Crypto.Signature import PKCS1_v1_5
+try:
+ from certkeys import publickeys
+ import ecdsa
+ from Crypto.Hash import SHA256
+ import Crypto.PublicKey.RSA as RSA
+ from Crypto.Signature import PKCS1_v1_5
+except:
+ print "Some imports failed, some functionality may be unavailable"
def prompt_confirm(msg = "", default = True):
@@ -292,7 +296,10 @@ def my_get_more_cert_info(s):
if "Not Before" in line:
result["not_before"] = line.split(": ")[1]
if "Policy:" in line:
- result["policy"].append(line.split("Policy: ")[1])
+ try:
+ result["policy"].append(line.split("Policy: ")[1])
+ except:
+ pass
if "CA:TRUE" in line:
# print line.lstrip()
result["ca"] = line.lstrip()