rpms/ca-certificates
6
0
Fork 0
Code Issues Pull Requests Releases Activity

update to r1.74

Browse Source
This commit is contained in:
Joe Orton 2011-04-20 10:12:55 +01:00
parent 0d2dd802d9
commit 37d25f7154
3 changed files with 3331 additions and 2947 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ca-certificates.spec
View File

@ -11,7 +11,7 @@
Summary: The Mozilla CA root certificate bundle Summary: The Mozilla CA root certificate bundle
Name: ca-certificates Name: ca-certificates
Version: 2011.70 Version: 2011.74
Release: 1%{?dist} Release: 1%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Base Group: System Environment/Base
@ -118,6 +118,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/ssl/certs %{_sysconfdir}/ssl/certs
%changelog %changelog
* Wed Apr 20 2011 Joe Orton <jorton@redhat.com> - 2011.74-1
- update to r1.74
* Wed Jan 12 2011 Joe Orton <jorton@redhat.com> - 2011.70-1 * Wed Jan 12 2011 Joe Orton <jorton@redhat.com> - 2011.70-1
- update to r1.70 - update to r1.70

6260
certdata.txt
View File

File diff suppressed because it is too large Load Diff

13
certdata2pem.py
View File

@ -93,13 +93,14 @@ if os.path.exists('blacklist.txt'):
trust = dict() trust = dict()
trustmap = dict() trustmap = dict()
for obj in objects: for obj in objects:
if obj['CKA_CLASS'] != 'CKO_NETSCAPE_TRUST':
if obj['CKA_CLASS'] != 'CKO_NSS_TRUST':
continue continue
if obj['CKA_LABEL'] in blacklist: if obj['CKA_LABEL'] in blacklist:
print "Certificate %s blacklisted, ignoring." % obj['CKA_LABEL'] print "Certificate %s blacklisted, ignoring." % obj['CKA_LABEL']
elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NETSCAPE_TRUSTED_DELEGATOR': elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR':
trust[obj['CKA_LABEL']] = True trust[obj['CKA_LABEL']] = True
elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NETSCAPE_TRUSTED_DELEGATOR': elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR':
trust[obj['CKA_LABEL']] = True trust[obj['CKA_LABEL']] = True
elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NETSCAPE_UNTRUSTED': elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NETSCAPE_UNTRUSTED':
print '!'*74 print '!'*74
@ -110,7 +111,9 @@ for obj in objects:
print "Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \ print "Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \
(obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'], (obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'],
obj['CKA_TRUST_EMAIL_PROTECTION']) obj['CKA_TRUST_EMAIL_PROTECTION'])
trustmap[obj['CKA_LABEL']] = obj label = obj['CKA_LABEL']
trustmap[label] = obj
print " added cert", label
def label_to_filename(label): def label_to_filename(label):
label = label.replace('/', '_')\ label = label.replace('/', '_')\
@ -156,7 +159,7 @@ for obj in objects:
openssl_trustflags = [] openssl_trustflags = []
tobj = trustmap[obj['CKA_LABEL']] tobj = trustmap[obj['CKA_LABEL']]
for t in trust_types.keys(): for t in trust_types.keys():
if tobj.has_key(t) and tobj[t] == 'CKT_NETSCAPE_TRUSTED_DELEGATOR': if tobj.has_key(t) and tobj[t] == 'CKT_NSS_TRUSTED_DELEGATOR':
trustbits.append(t) trustbits.append(t)
if t in openssl_trust: if t in openssl_trust:
openssl_trustflags.append(openssl_trust[t]) openssl_trustflags.append(openssl_trust[t])