diff options
| author | Michael Shuler <michael@pbandjelly.org> | 2016-01-04 11:01:32 -0600 |
|---|---|---|
| committer | Michael Shuler <michael@pbandjelly.org> | 2016-01-04 11:01:32 -0600 |
| commit | 3bc7f29a8c676f4395b8eceb868fb64e4d8caf30 (patch) | |
| tree | 9152b6a68f5f77f29f190b250e24cb533b2c5a6a | |
| parent | c5e8ded205eef9a3668ab8761226de71ab4eaeae (diff) | |
| parent | 12497a6769ffe51dac87e37bfc8376dd6e7e824f (diff) | |
| download | ca-certificates-3bc7f29a8c676f4395b8eceb868fb64e4d8caf30.tar.gz | |
Merge branch 'drop-NETSCAPE'
| -rw-r--r-- | mozilla/certdata2pem.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py index 7bd4d2d..f91422b 100644 --- a/mozilla/certdata2pem.py +++ b/mozilla/certdata2pem.py @@ -98,18 +98,15 @@ if os.path.exists('blacklist.txt'): # Build up trust database. trust = dict() for obj in objects: - if obj['CKA_CLASS'] not in ('CKO_NETSCAPE_TRUST', 'CKO_NSS_TRUST'): + if obj['CKA_CLASS'] != 'CKO_NSS_TRUST': continue if obj['CKA_LABEL'] in blacklist: print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL']) - elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_TRUSTED_DELEGATOR', - 'CKT_NSS_TRUSTED_DELEGATOR'): + elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR': trust[obj['CKA_LABEL']] = True - elif obj['CKA_TRUST_EMAIL_PROTECTION'] in ('CKT_NETSCAPE_TRUSTED_DELEGATOR', - 'CKT_NSS_TRUSTED_DELEGATOR'): + elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR': trust[obj['CKA_LABEL']] = True - elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_UNTRUSTED', - 'CKT_NSS_NOT_TRUSTED'): + elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED': print('!'*74) print("UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL']) print('!'*74) |