diff options
| author | Michael Shuler <michael@pbandjelly.org> | 2011-12-11 18:27:45 -0600 |
|---|---|---|
| committer | Michael Shuler <michael@pbandjelly.org> | 2011-12-11 18:27:45 -0600 |
| commit | ce5a2980213b9744156b9cf44e33488224ece292 (patch) | |
| tree | 3e12fbdf9bbe90d4fd9bc1d96ed60bb317eee81e /mozilla | |
| parent | c04ca9cf0f228920bbe786d05b1dd41cc068a60f (diff) | |
| download | ca-certificates-ce5a2980213b9744156b9cf44e33488224ece292.tar.gz | |
Update mozilla/certdata2pem.py in a nicer way
Diffstat (limited to 'mozilla')
| -rw-r--r-- | mozilla/certdata2pem.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py index 3c89e92..773ce0d 100644 --- a/mozilla/certdata2pem.py +++ b/mozilla/certdata2pem.py @@ -92,19 +92,18 @@ if os.path.exists('blacklist.txt'): # Build up trust database. trust = dict() for obj in objects: - if not (obj['CKA_CLASS'] == 'CKO_NETSCAPE_TRUST' or - obj['CKA_CLASS'] == 'CKO_NSS_TRUST'): + if obj['CKA_CLASS'] not in ('CKO_NETSCAPE_TRUST', 'CKO_NSS_TRUST'): continue if obj['CKA_LABEL'] in blacklist: print "Certificate %s blacklisted, ignoring." % obj['CKA_LABEL'] - elif (obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NETSCAPE_TRUSTED_DELEGATOR' or - obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR'): + elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_TRUSTED_DELEGATOR', + 'CKT_NSS_TRUSTED_DELEGATOR'): trust[obj['CKA_LABEL']] = True - elif (obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NETSCAPE_TRUSTED_DELEGATOR' or - obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR'): + elif obj['CKA_TRUST_EMAIL_PROTECTION'] in ('CKT_NETSCAPE_TRUSTED_DELEGATOR', + 'CKT_NSS_TRUSTED_DELEGATOR'): trust[obj['CKA_LABEL']] = True - elif (obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NETSCAPE_UNTRUSTED' or - obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED'): + elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_UNTRUSTED', + 'CKT_NSS_NOT_TRUSTED'): print '!'*74 print "UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL'] print '!'*74 |