ca-certificates: Update to 20170211 based on Fedora project package
This commit is contained in:
Alexey Pavlov committed
1 parent
10074d58db
commit
90374ad824
8 files changed
+30387
-2543
No files matched your search
@@ -1,19 +1,20 @@
|
||||
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
|
||||
# PKGBUILD is done from fedora repository - https://src.fedoraproject.org/cgit/rpms/ca-certificates.git
|
||||
|
||||
_realname=ca-certificates
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=20160104
|
||||
pkgrel=2
|
||||
pkgver=20170211
|
||||
pkgrel=1
|
||||
pkgdesc='Common CA certificates (mingw-w64)'
|
||||
arch=('any')
|
||||
url='https://packages.qa.debian.org/c/ca-certificates.html'
|
||||
license=('MPL' 'GPL')
|
||||
install="ca-certificates-${CARCH}.install"
|
||||
source=("http://ftp.debian.org/debian/pool/main/c/${_realname}/${_realname}_${pkgver}.tar.xz"
|
||||
source=("certdata.txt"
|
||||
"nssckbi.h"
|
||||
'StartSSL.sub.class1.server.ca.pem'::'https://www.startssl.com/certs/sub.class1.server.ca.pem'
|
||||
'certdata2pem-redhat.patch'
|
||||
'diff-from-upstream-2.3.patch'
|
||||
'certdata2pem.py'
|
||||
'trust-fixes'
|
||||
'update-ca-trust'
|
||||
'update-ca-trust.8')
|
||||
@@ -22,120 +23,123 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-openssl"
|
||||
"${MINGW_PACKAGE_PREFIX}-p11-kit"
|
||||
"${MINGW_PACKAGE_PREFIX}-python2"
|
||||
'asciidoc' 'python2' 'libxslt' 'sed' 'grep')
|
||||
sha256sums=('09eb770122e23260316120c0cbbddc8a1d33e7147210ce44e146084d5d5abcdd'
|
||||
'03e7975107cd51801abe91639fa3e0732d2202ccc379195ace00587160223b80'
|
||||
'87bab93ca70a8517d84ce4680d77c51108e37b69e9be0edc49c9872b36f9e47b'
|
||||
'5f7981a4bea23ac5e3726b64cc65f79863567b75fc0f8d671ee3db6dd54400a2'
|
||||
'eeebba0de2635ba4115c05b2acc95d475d47aa58796bb0868203805212f50381'
|
||||
'99783131cd4fe4efb67e5f4b992e310321ac2b6553b76f765b67569e445beffb'
|
||||
sha256sums=('dffa79e6aa993f558e82884abf7bb54bf440ab66ee91d82a27a627f6f2a4ace4'
|
||||
'0de36b9314a6876dcc8e9bf63eee9766d967cdb4735d350376eb40e02bfd0b82'
|
||||
'4eed32f02c1321685e08a06e104d69aa69bb5f1e2e9c251dc8d7e0b4c6e24a5e'
|
||||
'4e96bd7424062d365b75247dfc4b3b6510f09ca5161c0f7c3ce76b10edf633aa'
|
||||
'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
|
||||
'65fc13d01550be7f89046a62605d6203eb68dba7edf5dbb04a2068b4f7cd2e65'
|
||||
'a73c6430e734178b9aa4d303709470383bc2b1cfbeb0d44fe34615df812f479d')
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/${_realname}-${pkgver}
|
||||
cp ${srcdir}/trust-fixes mozilla/
|
||||
cp ${srcdir}/update-ca-trust sbin/
|
||||
cp ${srcdir}/update-ca-trust.8 sbin/
|
||||
patch -p1 -i ${srcdir}/certdata2pem-redhat.patch
|
||||
patch -p0 -i ${srcdir}/diff-from-upstream-2.3.patch
|
||||
sed "s|/usr/bin/python|${MINGW_PREFIX}/bin/python2|g" -i mozilla/certdata2pem.py
|
||||
sed "s|/usr/bin/python|${MINGW_PREFIX}/bin/python2|g" -i certdata2pem.py
|
||||
mkdir certs
|
||||
mkdir certs/legacy-default
|
||||
mkdir certs/legacy-disable
|
||||
mkdir java
|
||||
cp certdata.txt certs/
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/${_realname}-${pkgver}/mozilla
|
||||
${MINGW_PREFIX}/bin/python2 certdata2pem.py
|
||||
cd ${srcdir}
|
||||
|
||||
pushd certs > /dev/null
|
||||
${MINGW_PREFIX}/bin/python2 ../certdata2pem.py >c2p.log 2>c2p.err
|
||||
popd > /dev/null
|
||||
|
||||
(
|
||||
cat <<EOF
|
||||
# This is a bundle of X.509 certificates of public Certificate
|
||||
# Authorities. It was generated from the Mozilla root CA list.
|
||||
# These certificates are in the OpenSSL "TRUSTED CERTIFICATE"
|
||||
# format and have trust bits set accordingly.
|
||||
# These certificates and trust/distrust attributes use the file format accepted
|
||||
# by the p11-kit-trust module.
|
||||
#
|
||||
# Source: mozilla/security/nss/lib/ckfw/builtins/certdata.txt
|
||||
# Source: nss/lib/ckfw/builtins/certdata.txt
|
||||
# Source: nss/lib/ckfw/builtins/nssckbi.h
|
||||
#
|
||||
# Generated from:
|
||||
EOF
|
||||
grep -w NSS_BUILTINS_LIBRARY_VERSION nssckbi.h | awk '{print "# " $2 " " $3}';
|
||||
cat nssckbi.h | grep -w NSS_BUILTINS_LIBRARY_VERSION | awk '{print "# " $2 " " $3}';
|
||||
echo '#';
|
||||
) > ${srcdir}/${_realname}-${pkgver}/ca-bundle.trust.crt
|
||||
) > ${srcdir}/ca-bundle.trust.crt
|
||||
|
||||
# Make sure repeat runs don't accumulate duplicate certs.
|
||||
if [ -f ${srcdir}/${pkgname}/ca-bundle.neutral-trust.crt ]; then
|
||||
rm -f ${srcdir}/${pkgname}/ca-bundle.neutral-trust.crt
|
||||
fi
|
||||
if [ -f ${srcdir}/${pkgname}/ca-bundle.supplement.p11-kit ]; then
|
||||
rm -f ${srcdir}/${pkgname}/ca-bundle.supplement.p11-kit
|
||||
touch ca-bundle.legacy.default.crt
|
||||
local NUM_LEGACY_DEFAULT=`find certs/legacy-default -type f | wc -l`
|
||||
if [ $NUM_LEGACY_DEFAULT -ne 0 ]; then
|
||||
for f in certs/legacy-default/*.crt; do
|
||||
echo "processing $f"
|
||||
tbits=`sed -n '/^# openssl-trust/{s/^.*=//;p;}' $f`
|
||||
alias=`sed -n '/^# alias=/{s/^.*=//;p;q;}' $f | sed "s/'//g" | sed 's/"//g'`
|
||||
targs=""
|
||||
if [ -n "$tbits" ]; then
|
||||
for t in $tbits; do
|
||||
targs="${targs} -addtrust $t"
|
||||
done
|
||||
fi
|
||||
if [ -n "$targs" ]; then
|
||||
echo "legacy default flags $targs for $f" >> info.trust
|
||||
openssl x509 -text -in "$f" -trustout $targs -setalias "$alias" >> ca-bundle.legacy.default.crt
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
> info.trust
|
||||
> info.notrust
|
||||
touch ca-bundle.legacy.disable.crt
|
||||
NUM_LEGACY_DISABLE=`find certs/legacy-disable -type f | wc -l`
|
||||
if [ $NUM_LEGACY_DISABLE -ne 0 ]; then
|
||||
for f in certs/legacy-disable/*.crt; do
|
||||
echo "processing $f"
|
||||
tbits=`sed -n '/^# openssl-trust/{s/^.*=//;p;}' $f`
|
||||
alias=`sed -n '/^# alias=/{s/^.*=//;p;q;}' $f | sed "s/'//g" | sed 's/"//g'`
|
||||
targs=""
|
||||
if [ -n "$tbits" ]; then
|
||||
for t in $tbits; do
|
||||
targs="${targs} -addtrust $t"
|
||||
done
|
||||
fi
|
||||
if [ -n "$targs" ]; then
|
||||
echo "legacy disable flags $targs for $f" >> info.trust
|
||||
openssl x509 -text -in "$f" -trustout $targs -setalias "$alias" >> ca-bundle.legacy.disable.crt
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Add custom certificate
|
||||
echo '# alias="StartCom Class 1 Primary Intermediate Server CA"' > StartSSL.sub.class1.server.ca.crt
|
||||
echo '# trust=CKA_TRUST_CODE_SIGNING CKA_TRUST_EMAIL_PROTECTION CKA_TRUST_SERVER_AUTH' >> StartSSL.sub.class1.server.ca.crt
|
||||
echo '# distrust=' >> StartSSL.sub.class1.server.ca.crt
|
||||
echo '# openssl-trust=codeSigning emailProtection serverAuth' >> StartSSL.sub.class1.server.ca.crt
|
||||
cat "${srcdir}/StartSSL.sub.class1.server.ca.pem" >> StartSSL.sub.class1.server.ca.crt
|
||||
echo '# alias="StartCom Class 1 Primary Intermediate Server CA"' > certs/StartSSL.sub.class1.server.ca.crt
|
||||
echo '# trust=CKA_TRUST_CODE_SIGNING CKA_TRUST_EMAIL_PROTECTION CKA_TRUST_SERVER_AUTH' >> certs/StartSSL.sub.class1.server.ca.crt
|
||||
echo '# distrust=' >> certs/StartSSL.sub.class1.server.ca.crt
|
||||
echo '# openssl-trust=codeSigning emailProtection serverAuth' >> certs/StartSSL.sub.class1.server.ca.crt
|
||||
cat ${srcdir}/StartSSL.sub.class1.server.ca.pem >> certs/StartSSL.sub.class1.server.ca.crt
|
||||
|
||||
local f=
|
||||
for f in *.crt
|
||||
do
|
||||
echo "processing ${f}"
|
||||
tbits=`sed -n '/^# openssl-trust/{s/^.*=//;p;}' ${f}`
|
||||
distbits=`sed -n '/^# openssl-distrust/{s/^.*=//;p;}' ${f}`
|
||||
alias=`sed -n '/^# alias=/{s/^.*=//;p;q;}' ${f} | sed "s/'//g" | sed 's/"//g'`
|
||||
targs=""
|
||||
local P11FILES=`find certs -name \*.tmp-p11-kit | wc -l`
|
||||
if [ $P11FILES -ne 0 ]; then
|
||||
for p in certs/*.tmp-p11-kit; do
|
||||
cat "$p" >> ${srcdir}/ca-bundle.trust.crt
|
||||
done
|
||||
fi
|
||||
|
||||
if [ -n "${tbits}" ]
|
||||
then
|
||||
for t in ${tbits}
|
||||
do
|
||||
targs="${targs} -addtrust ${t}"
|
||||
done
|
||||
fi
|
||||
if [ -n "${distbits}" ]
|
||||
then
|
||||
for t in ${distbits}
|
||||
do
|
||||
targs="${targs} -addreject ${t}"
|
||||
done
|
||||
fi
|
||||
if [ -n "${targs}" ]
|
||||
then
|
||||
echo "trust flags $targs for ${f}" >> info.trust
|
||||
${MINGW_PREFIX}/bin/openssl x509 -text -in "${f}" -trustout ${targs} -setalias "${alias}" >> ${srcdir}/${_realname}-${pkgver}/ca-bundle.trust.crt
|
||||
else
|
||||
echo "no trust flags for ${f}" >> tee -a info.notrust
|
||||
${MINGW_PREFIX}/bin/openssl x509 -text -in "${f}" -setalias "${alias}" >> ${srcdir}/${_realname}-${pkgver}/ca-bundle.neutral-trust.crt
|
||||
fi
|
||||
done
|
||||
for p in *.p11-kit
|
||||
do
|
||||
cat ${p} >> ${srcdir}/${_realname}-${pkgver}/ca-bundle.supplement.p11-kit
|
||||
done
|
||||
cat trust-fixes >> ${srcdir}/${_realname}-${pkgver}/ca-bundle.supplement.p11-kit
|
||||
# Append our trust fixes
|
||||
cat trust-fixes >> ${srcdir}/ca-bundle.trust.crt
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${srcdir}/${_realname}-${pkgver}
|
||||
cd ${srcdir}
|
||||
|
||||
mkdir -p ${pkgdir}${MINGW_PREFIX}/{bin,lib,share}
|
||||
mkdir -p ${pkgdir}${MINGW_PREFIX}/etc
|
||||
mkdir -p ${pkgdir}${MINGW_PREFIX}/share/man/man8
|
||||
|
||||
sed -e "s|@PREFIX@|${MINGW_PREFIX}|g" -i sbin/update-ca-trust
|
||||
cp -f sbin/update-ca-trust ${pkgdir}${MINGW_PREFIX}/bin/
|
||||
cp -f sbin/update-ca-trust.8 ${pkgdir}${MINGW_PREFIX}/share/man/man8/
|
||||
sed -e "s|@PREFIX@|${MINGW_PREFIX}|g" -i update-ca-trust
|
||||
cp -f update-ca-trust ${pkgdir}${MINGW_PREFIX}/bin/
|
||||
cp -f update-ca-trust.8 ${pkgdir}${MINGW_PREFIX}/share/man/man8/
|
||||
|
||||
# for p11-kit
|
||||
mkdir -p ${pkgdir}${MINGW_PREFIX}/lib/p11-kit
|
||||
cp -f sbin/update-ca-trust ${pkgdir}${MINGW_PREFIX}/lib/p11-kit/p11-kit-extract-trust
|
||||
cp -f update-ca-trust ${pkgdir}${MINGW_PREFIX}/lib/p11-kit/p11-kit-extract-trust
|
||||
|
||||
mkdir -p ${pkgdir}${MINGW_PREFIX}/share/pki/ca-trust-source
|
||||
for file in ca-bundle.{trust.crt,neutral-trust.crt,supplement.p11-kit}
|
||||
do
|
||||
cp -f ${file} ${pkgdir}${MINGW_PREFIX}/share/pki/ca-trust-source
|
||||
done
|
||||
mkdir -p ${pkgdir}${MINGW_PREFIX}/share/pki/ca-trust-{source,legacy}
|
||||
install -p -m 644 ca-bundle.trust.crt ${pkgdir}${MINGW_PREFIX}/share/pki/ca-trust-source/ca-bundle.trust.crt
|
||||
install -p -m 644 ca-bundle.legacy.default.crt ${pkgdir}${MINGW_PREFIX}/share/pki/ca-trust-legacy/ca-bundle.legacy.default.crt
|
||||
install -p -m 644 ca-bundle.legacy.disable.crt ${pkgdir}${MINGW_PREFIX}/share/pki/ca-trust-legacy/ca-bundle.legacy.disable.crt
|
||||
|
||||
# touch all files overwritten by update-ca-trust for easy cleanup
|
||||
mkdir -p ${pkgdir}${MINGW_PREFIX}/etc/pki/ca-trust/{extracted,source}
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,197 +0,0 @@
|
||||
--- ca-certificates/mozilla/certdata2pem.py.orig 2014-03-13 16:43:00.000000000 +0400
|
||||
+++ ca-certificates/mozilla/certdata2pem.py 2014-07-26 01:53:07.583600000 +0400
|
||||
@@ -4,6 +4,7 @@
|
||||
# certdata2pem.py - splits certdata.txt into multiple files
|
||||
#
|
||||
# Copyright (C) 2009 Philipp Kern <pkern@debian.org>
|
||||
+# Copyright (C) 2013 Kai Engert <kaie@redhat.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -25,9 +26,13 @@
|
||||
import re
|
||||
import sys
|
||||
import textwrap
|
||||
+import urllib
|
||||
|
||||
objects = []
|
||||
|
||||
+def printable_serial(obj):
|
||||
+ return ".".join(map(lambda x:str(ord(x)), obj['CKA_SERIAL_NUMBER']))
|
||||
+
|
||||
# Dirty file parser.
|
||||
in_data, in_multiline, in_obj = False, False, False
|
||||
field, type, value, obj = None, None, None, dict()
|
||||
@@ -70,7 +75,7 @@
|
||||
field, type = line_parts
|
||||
value = None
|
||||
else:
|
||||
- raise NotImplementedError, 'line_parts < 2 not supported.'
|
||||
+ raise NotImplementedError, 'line_parts < 2 not supported.\n' + line
|
||||
if type == 'MULTILINE_OCTAL':
|
||||
in_multiline = True
|
||||
value = ""
|
||||
@@ -79,55 +84,117 @@
|
||||
if len(obj.items()) > 0:
|
||||
objects.append(obj)
|
||||
|
||||
-# Read blacklist.
|
||||
-blacklist = []
|
||||
-if os.path.exists('blacklist.txt'):
|
||||
- for line in open('blacklist.txt', 'r'):
|
||||
- line = line.strip()
|
||||
- if line.startswith('#') or len(line) == 0:
|
||||
- continue
|
||||
- item = line.split('#', 1)[0].strip()
|
||||
- blacklist.append(item)
|
||||
-
|
||||
# Build up trust database.
|
||||
-trust = dict()
|
||||
+trustmap = 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'):
|
||||
- trust[obj['CKA_LABEL']] = True
|
||||
- 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'] in ('CKT_NETSCAPE_UNTRUSTED',
|
||||
- 'CKT_NSS_NOT_TRUSTED'):
|
||||
- print '!'*74
|
||||
- print "UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL']
|
||||
- print '!'*74
|
||||
- else:
|
||||
- print "Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \
|
||||
- (obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'],
|
||||
- obj['CKA_TRUST_EMAIL_PROTECTION'])
|
||||
+ key = obj['CKA_LABEL'] + printable_serial(obj)
|
||||
+ trustmap[key] = obj
|
||||
+ print " added trust", key
|
||||
|
||||
+# Build up cert database.
|
||||
+certmap = dict()
|
||||
for obj in objects:
|
||||
- if obj['CKA_CLASS'] == 'CKO_CERTIFICATE':
|
||||
- if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]:
|
||||
- continue
|
||||
- bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\
|
||||
- .replace(' ', '_')\
|
||||
- .replace('(', '=')\
|
||||
- .replace(')', '=')\
|
||||
- .replace(',', '_')
|
||||
- bname = bname.decode('string_escape')
|
||||
- fname = bname + '.crt'
|
||||
- if os.path.exists(fname):
|
||||
- print "Found duplicate certificate name %s, renaming." % bname
|
||||
- fname = bname + '_2.crt'
|
||||
- f = open(fname, 'w')
|
||||
- f.write("-----BEGIN CERTIFICATE-----\n")
|
||||
- f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64)))
|
||||
- f.write("\n-----END CERTIFICATE-----\n")
|
||||
+ if obj['CKA_CLASS'] != 'CKO_CERTIFICATE':
|
||||
+ continue
|
||||
+ key = obj['CKA_LABEL'] + printable_serial(obj)
|
||||
+ certmap[key] = obj
|
||||
+ print " added cert", key
|
||||
+
|
||||
+def obj_to_filename(obj):
|
||||
+ label = obj['CKA_LABEL'][1:-1]
|
||||
+ label = label.replace('/', '_')\
|
||||
+ .replace(' ', '_')\
|
||||
+ .replace(':', '_')\
|
||||
+ .replace('(', '=')\
|
||||
+ .replace(')', '=')\
|
||||
+ .replace(',', '_')
|
||||
+ label = re.sub(r'\\x[0-9a-fA-F]{2}', lambda m:chr(int(m.group(0)[2:], 16)), label)
|
||||
+ serial = printable_serial(obj)
|
||||
+ return label + "_" + serial
|
||||
+
|
||||
+trust_types = {
|
||||
+ "CKA_TRUST_DIGITAL_SIGNATURE": "digital-signature",
|
||||
+ "CKA_TRUST_NON_REPUDIATION": "non-repudiation",
|
||||
+ "CKA_TRUST_KEY_ENCIPHERMENT": "key-encipherment",
|
||||
+ "CKA_TRUST_DATA_ENCIPHERMENT": "data-encipherment",
|
||||
+ "CKA_TRUST_KEY_AGREEMENT": "key-agreement",
|
||||
+ "CKA_TRUST_KEY_CERT_SIGN": "cert-sign",
|
||||
+ "CKA_TRUST_CRL_SIGN": "crl-sign",
|
||||
+ "CKA_TRUST_SERVER_AUTH": "server-auth",
|
||||
+ "CKA_TRUST_CLIENT_AUTH": "client-auth",
|
||||
+ "CKA_TRUST_CODE_SIGNING": "code-signing",
|
||||
+ "CKA_TRUST_EMAIL_PROTECTION": "email-protection",
|
||||
+ "CKA_TRUST_IPSEC_END_SYSTEM": "ipsec-end-system",
|
||||
+ "CKA_TRUST_IPSEC_TUNNEL": "ipsec-tunnel",
|
||||
+ "CKA_TRUST_IPSEC_USER": "ipsec-user",
|
||||
+ "CKA_TRUST_TIME_STAMPING": "time-stamping",
|
||||
+ "CKA_TRUST_STEP_UP_APPROVED": "step-up-approved",
|
||||
+}
|
||||
+
|
||||
+openssl_trust = {
|
||||
+ "CKA_TRUST_SERVER_AUTH": "serverAuth",
|
||||
+ "CKA_TRUST_CLIENT_AUTH": "clientAuth",
|
||||
+ "CKA_TRUST_CODE_SIGNING": "codeSigning",
|
||||
+ "CKA_TRUST_EMAIL_PROTECTION": "emailProtection",
|
||||
+}
|
||||
+
|
||||
+for tobj in objects:
|
||||
+ if tobj['CKA_CLASS'] == 'CKO_NSS_TRUST':
|
||||
+ key = tobj['CKA_LABEL'] + printable_serial(tobj)
|
||||
+ print "producing trust for " + key
|
||||
+ trustbits = []
|
||||
+ distrustbits = []
|
||||
+ openssl_trustflags = []
|
||||
+ openssl_distrustflags = []
|
||||
+ for t in trust_types.keys():
|
||||
+ if tobj.has_key(t) and tobj[t] == 'CKT_NSS_TRUSTED_DELEGATOR':
|
||||
+ trustbits.append(t)
|
||||
+ if t in openssl_trust:
|
||||
+ openssl_trustflags.append(openssl_trust[t])
|
||||
+ if tobj.has_key(t) and tobj[t] == 'CKT_NSS_NOT_TRUSTED':
|
||||
+ distrustbits.append(t)
|
||||
+ if t in openssl_trust:
|
||||
+ openssl_distrustflags.append(openssl_trust[t])
|
||||
+
|
||||
+ fname = obj_to_filename(tobj)
|
||||
+ try:
|
||||
+ obj = certmap[key]
|
||||
+ except:
|
||||
+ obj = None
|
||||
+
|
||||
+ if obj != None:
|
||||
+ fname += ".crt"
|
||||
+ else:
|
||||
+ fname += ".p11-kit"
|
||||
|
||||
+ f = open(fname, 'w')
|
||||
+ if obj != None:
|
||||
+ f.write("# alias=%s\n"%tobj['CKA_LABEL'])
|
||||
+ f.write("# trust=" + " ".join(trustbits) + "\n")
|
||||
+ f.write("# distrust=" + " ".join(distrustbits) + "\n")
|
||||
+ if openssl_trustflags:
|
||||
+ f.write("# openssl-trust=" + " ".join(openssl_trustflags) + "\n")
|
||||
+ if openssl_distrustflags:
|
||||
+ f.write("# openssl-distrust=" + " ".join(openssl_distrustflags) + "\n")
|
||||
+ f.write("-----BEGIN CERTIFICATE-----\n")
|
||||
+ f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64)))
|
||||
+ f.write("\n-----END CERTIFICATE-----\n")
|
||||
+ else:
|
||||
+ f.write("[p11-kit-object-v1]\n")
|
||||
+ f.write("label: ");
|
||||
+ f.write(tobj['CKA_LABEL']);
|
||||
+ f.write("\n")
|
||||
+ f.write("class: certificate\n")
|
||||
+ f.write("certificate-type: x-509\n")
|
||||
+ f.write("issuer: \"");
|
||||
+ f.write(urllib.quote(tobj['CKA_ISSUER']));
|
||||
+ f.write("\"\n")
|
||||
+ f.write("serial-number: \"");
|
||||
+ f.write(urllib.quote(tobj['CKA_SERIAL_NUMBER']));
|
||||
+ f.write("\"\n")
|
||||
+ if (tobj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED') or (tobj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_NOT_TRUSTED') or (tobj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_NOT_TRUSTED'):
|
||||
+ f.write("x-distrusted: true\n")
|
||||
+ f.write("\n\n")
|
||||
+ print " -> written as '%s', trust = %s, openssl-trust = %s, distrust = %s, openssl-distrust = %s" % (fname, trustbits, openssl_trustflags, distrustbits, openssl_distrustflags)
|
||||
@@ -0,0 +1,379 @@
|
||||
#!/usr/bin/python
|
||||
# vim:set et sw=4:
|
||||
#
|
||||
# certdata2pem.py - splits certdata.txt into multiple files
|
||||
#
|
||||
# Copyright (C) 2009 Philipp Kern <pkern@debian.org>
|
||||
# Copyright (C) 2013 Kai Engert <kaie@redhat.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
|
||||
# USA.
|
||||
|
||||
import base64
|
||||
import os.path
|
||||
import re
|
||||
import sys
|
||||
import textwrap
|
||||
import urllib
|
||||
import subprocess
|
||||
|
||||
objects = []
|
||||
|
||||
def printable_serial(obj):
|
||||
return ".".join(map(lambda x:str(ord(x)), obj['CKA_SERIAL_NUMBER']))
|
||||
|
||||
# Dirty file parser.
|
||||
in_data, in_multiline, in_obj = False, False, False
|
||||
field, type, value, obj = None, None, None, dict()
|
||||
for line in open('certdata.txt', 'r'):
|
||||
# Ignore the file header.
|
||||
if not in_data:
|
||||
if line.startswith('BEGINDATA'):
|
||||
in_data = True
|
||||
continue
|
||||
# Ignore comment lines.
|
||||
if line.startswith('#'):
|
||||
continue
|
||||
# Empty lines are significant if we are inside an object.
|
||||
if in_obj and len(line.strip()) == 0:
|
||||
objects.append(obj)
|
||||
obj = dict()
|
||||
in_obj = False
|
||||
continue
|
||||
if len(line.strip()) == 0:
|
||||
continue
|
||||
if in_multiline:
|
||||
if not line.startswith('END'):
|
||||
if type == 'MULTILINE_OCTAL':
|
||||
line = line.strip()
|
||||
for i in re.finditer(r'\\([0-3][0-7][0-7])', line):
|
||||
value += chr(int(i.group(1), 8))
|
||||
else:
|
||||
value += line
|
||||
continue
|
||||
obj[field] = value
|
||||
in_multiline = False
|
||||
continue
|
||||
if line.startswith('CKA_CLASS'):
|
||||
in_obj = True
|
||||
line_parts = line.strip().split(' ', 2)
|
||||
if len(line_parts) > 2:
|
||||
field, type = line_parts[0:2]
|
||||
value = ' '.join(line_parts[2:])
|
||||
elif len(line_parts) == 2:
|
||||
field, type = line_parts
|
||||
value = None
|
||||
else:
|
||||
raise NotImplementedError('line_parts < 2 not supported.\n' + line)
|
||||
if type == 'MULTILINE_OCTAL':
|
||||
in_multiline = True
|
||||
value = ""
|
||||
continue
|
||||
obj[field] = value
|
||||
if len(obj.items()) > 0:
|
||||
objects.append(obj)
|
||||
|
||||
# Build up trust database.
|
||||
trustmap = dict()
|
||||
for obj in objects:
|
||||
if obj['CKA_CLASS'] != 'CKO_NSS_TRUST':
|
||||
continue
|
||||
key = obj['CKA_LABEL'] + printable_serial(obj)
|
||||
trustmap[key] = obj
|
||||
print " added trust", key
|
||||
|
||||
# Build up cert database.
|
||||
certmap = dict()
|
||||
for obj in objects:
|
||||
if obj['CKA_CLASS'] != 'CKO_CERTIFICATE':
|
||||
continue
|
||||
key = obj['CKA_LABEL'] + printable_serial(obj)
|
||||
certmap[key] = obj
|
||||
print " added cert", key
|
||||
|
||||
def obj_to_filename(obj):
|
||||
label = obj['CKA_LABEL'][1:-1]
|
||||
label = label.replace('/', '_')\
|
||||
.replace(' ', '_')\
|
||||
.replace(':', '_')\
|
||||
.replace('(', '=')\
|
||||
.replace(')', '=')\
|
||||
.replace(',', '_')
|
||||
label = re.sub(r'\\x[0-9a-fA-F]{2}', lambda m:chr(int(m.group(0)[2:], 16)), label)
|
||||
serial = printable_serial(obj)
|
||||
return label + "_" + serial
|
||||
|
||||
def write_cert_ext_to_file(f, oid, value, public_key):
|
||||
f.write("[p11-kit-object-v1]\n")
|
||||
f.write("label: ");
|
||||
f.write(tobj['CKA_LABEL'])
|
||||
f.write("\n")
|
||||
f.write("class: x-certificate-extension\n");
|
||||
f.write("object-id: " + oid + "\n")
|
||||
f.write("value: \"" + value + "\"\n")
|
||||
f.write("modifiable: false\n");
|
||||
f.write(public_key)
|
||||
|
||||
trust_types = {
|
||||
"CKA_TRUST_DIGITAL_SIGNATURE": "digital-signature",
|
||||
"CKA_TRUST_NON_REPUDIATION": "non-repudiation",
|
||||
"CKA_TRUST_KEY_ENCIPHERMENT": "key-encipherment",
|
||||
"CKA_TRUST_DATA_ENCIPHERMENT": "data-encipherment",
|
||||
"CKA_TRUST_KEY_AGREEMENT": "key-agreement",
|
||||
"CKA_TRUST_KEY_CERT_SIGN": "cert-sign",
|
||||
"CKA_TRUST_CRL_SIGN": "crl-sign",
|
||||
"CKA_TRUST_SERVER_AUTH": "server-auth",
|
||||
"CKA_TRUST_CLIENT_AUTH": "client-auth",
|
||||
"CKA_TRUST_CODE_SIGNING": "code-signing",
|
||||
"CKA_TRUST_EMAIL_PROTECTION": "email-protection",
|
||||
"CKA_TRUST_IPSEC_END_SYSTEM": "ipsec-end-system",
|
||||
"CKA_TRUST_IPSEC_TUNNEL": "ipsec-tunnel",
|
||||
"CKA_TRUST_IPSEC_USER": "ipsec-user",
|
||||
"CKA_TRUST_TIME_STAMPING": "time-stamping",
|
||||
"CKA_TRUST_STEP_UP_APPROVED": "step-up-approved",
|
||||
}
|
||||
|
||||
legacy_trust_types = {
|
||||
"LEGACY_CKA_TRUST_SERVER_AUTH": "server-auth",
|
||||
"LEGACY_CKA_TRUST_CODE_SIGNING": "code-signing",
|
||||
"LEGACY_CKA_TRUST_EMAIL_PROTECTION": "email-protection",
|
||||
}
|
||||
|
||||
legacy_to_real_trust_types = {
|
||||
"LEGACY_CKA_TRUST_SERVER_AUTH": "CKA_TRUST_SERVER_AUTH",
|
||||
"LEGACY_CKA_TRUST_CODE_SIGNING": "CKA_TRUST_CODE_SIGNING",
|
||||
"LEGACY_CKA_TRUST_EMAIL_PROTECTION": "CKA_TRUST_EMAIL_PROTECTION",
|
||||
}
|
||||
|
||||
openssl_trust = {
|
||||
"CKA_TRUST_SERVER_AUTH": "serverAuth",
|
||||
"CKA_TRUST_CLIENT_AUTH": "clientAuth",
|
||||
"CKA_TRUST_CODE_SIGNING": "codeSigning",
|
||||
"CKA_TRUST_EMAIL_PROTECTION": "emailProtection",
|
||||
}
|
||||
|
||||
for tobj in objects:
|
||||
if tobj['CKA_CLASS'] == 'CKO_NSS_TRUST':
|
||||
key = tobj['CKA_LABEL'] + printable_serial(tobj)
|
||||
print "producing trust for " + key
|
||||
trustbits = []
|
||||
distrustbits = []
|
||||
openssl_trustflags = []
|
||||
openssl_distrustflags = []
|
||||
legacy_trustbits = []
|
||||
legacy_openssl_trustflags = []
|
||||
for t in trust_types.keys():
|
||||
if tobj.has_key(t) and tobj[t] == 'CKT_NSS_TRUSTED_DELEGATOR':
|
||||
trustbits.append(t)
|
||||
if t in openssl_trust:
|
||||
openssl_trustflags.append(openssl_trust[t])
|
||||
if tobj.has_key(t) and tobj[t] == 'CKT_NSS_NOT_TRUSTED':
|
||||
distrustbits.append(t)
|
||||
if t in openssl_trust:
|
||||
openssl_distrustflags.append(openssl_trust[t])
|
||||
|
||||
for t in legacy_trust_types.keys():
|
||||
if tobj.has_key(t) and tobj[t] == 'CKT_NSS_TRUSTED_DELEGATOR':
|
||||
real_t = legacy_to_real_trust_types[t]
|
||||
legacy_trustbits.append(real_t)
|
||||
if real_t in openssl_trust:
|
||||
legacy_openssl_trustflags.append(openssl_trust[real_t])
|
||||
if tobj.has_key(t) and tobj[t] == 'CKT_NSS_NOT_TRUSTED':
|
||||
raise NotImplementedError, 'legacy distrust not supported.\n' + line
|
||||
|
||||
fname = obj_to_filename(tobj)
|
||||
try:
|
||||
obj = certmap[key]
|
||||
except:
|
||||
obj = None
|
||||
|
||||
# optional debug code, that dumps the parsed input to files
|
||||
#fulldump = "dump-" + fname
|
||||
#dumpf = open(fulldump, 'w')
|
||||
#dumpf.write(str(obj));
|
||||
#dumpf.write(str(tobj));
|
||||
#dumpf.close();
|
||||
|
||||
is_legacy = 0
|
||||
if tobj.has_key('LEGACY_CKA_TRUST_SERVER_AUTH') or tobj.has_key('LEGACY_CKA_TRUST_EMAIL_PROTECTION') or tobj.has_key('LEGACY_CKA_TRUST_CODE_SIGNING'):
|
||||
is_legacy = 1
|
||||
if obj == None:
|
||||
raise NotImplementedError, 'found legacy trust without certificate.\n' + line
|
||||
|
||||
legacy_fname = "legacy-default/" + fname + ".crt"
|
||||
f = open(legacy_fname, 'w')
|
||||
f.write("# alias=%s\n"%tobj['CKA_LABEL'])
|
||||
f.write("# trust=" + " ".join(legacy_trustbits) + "\n")
|
||||
if legacy_openssl_trustflags:
|
||||
f.write("# openssl-trust=" + " ".join(legacy_openssl_trustflags) + "\n")
|
||||
f.write("-----BEGIN CERTIFICATE-----\n")
|
||||
f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64)))
|
||||
f.write("\n-----END CERTIFICATE-----\n")
|
||||
f.close()
|
||||
|
||||
if tobj.has_key('CKA_TRUST_SERVER_AUTH') or tobj.has_key('CKA_TRUST_EMAIL_PROTECTION') or tobj.has_key('CKA_TRUST_CODE_SIGNING'):
|
||||
legacy_fname = "legacy-disable/" + fname + ".crt"
|
||||
f = open(legacy_fname, 'w')
|
||||
f.write("# alias=%s\n"%tobj['CKA_LABEL'])
|
||||
f.write("# trust=" + " ".join(trustbits) + "\n")
|
||||
if openssl_trustflags:
|
||||
f.write("# openssl-trust=" + " ".join(openssl_trustflags) + "\n")
|
||||
f.write("-----BEGIN CERTIFICATE-----\n")
|
||||
f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64)))
|
||||
f.write("\n-----END CERTIFICATE-----\n")
|
||||
f.close()
|
||||
|
||||
# don't produce p11-kit output for legacy certificates
|
||||
continue
|
||||
|
||||
pk = ''
|
||||
cert_comment = ''
|
||||
if obj != None:
|
||||
# must extract the public key from the cert, let's use openssl
|
||||
cert_fname = "cert-" + fname
|
||||
fc = open(cert_fname, 'w')
|
||||
fc.write("-----BEGIN CERTIFICATE-----\n")
|
||||
fc.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64)))
|
||||
fc.write("\n-----END CERTIFICATE-----\n")
|
||||
fc.close();
|
||||
pk_fname = "pubkey-" + fname
|
||||
fpkout = open(pk_fname, "w")
|
||||
dump_pk_command = ["openssl", "x509", "-in", cert_fname, "-noout", "-pubkey"]
|
||||
subprocess.call(dump_pk_command, stdout=fpkout)
|
||||
fpkout.close()
|
||||
with open (pk_fname, "r") as myfile:
|
||||
pk=myfile.read()
|
||||
# obtain certificate information suitable as a comment
|
||||
comment_fname = "comment-" + fname
|
||||
fcout = open(comment_fname, "w")
|
||||
comment_command = ["openssl", "x509", "-in", cert_fname, "-noout", "-text"]
|
||||
subprocess.call(comment_command, stdout=fcout)
|
||||
fcout.close()
|
||||
sed_command = ["sed", "--in-place", "s/^/#/", comment_fname]
|
||||
subprocess.call(sed_command)
|
||||
with open (comment_fname, "r") as myfile:
|
||||
cert_comment=myfile.read()
|
||||
|
||||
fname += ".tmp-p11-kit"
|
||||
f = open(fname, 'w')
|
||||
|
||||
if obj != None:
|
||||
is_distrusted = False
|
||||
has_server_trust = False
|
||||
has_email_trust = False
|
||||
has_code_trust = False
|
||||
|
||||
if tobj.has_key('CKA_TRUST_SERVER_AUTH'):
|
||||
if tobj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED':
|
||||
is_distrusted = True
|
||||
elif tobj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR':
|
||||
has_server_trust = True
|
||||
|
||||
if tobj.has_key('CKA_TRUST_EMAIL_PROTECTION'):
|
||||
if tobj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_NOT_TRUSTED':
|
||||
is_distrusted = True
|
||||
elif tobj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR':
|
||||
has_email_trust = True
|
||||
|
||||
if tobj.has_key('CKA_TRUST_CODE_SIGNING'):
|
||||
if tobj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_NOT_TRUSTED':
|
||||
is_distrusted = True
|
||||
elif tobj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_TRUSTED_DELEGATOR':
|
||||
has_code_trust = True
|
||||
|
||||
if is_distrusted:
|
||||
trust_ext_oid = "1.3.6.1.4.1.3319.6.10.1"
|
||||
trust_ext_value = "0.%06%0a%2b%06%01%04%01%99w%06%0a%01%04 0%1e%06%08%2b%06%01%05%05%07%03%04%06%08%2b%06%01%05%05%07%03%01%06%08%2b%06%01%05%05%07%03%03"
|
||||
write_cert_ext_to_file(f, trust_ext_oid, trust_ext_value, pk)
|
||||
|
||||
trust_ext_oid = "2.5.29.37"
|
||||
if has_server_trust:
|
||||
if has_email_trust:
|
||||
if has_code_trust:
|
||||
# server + email + code
|
||||
trust_ext_value = "0%2a%06%03U%1d%25%01%01%ff%04 0%1e%06%08%2b%06%01%05%05%07%03%04%06%08%2b%06%01%05%05%07%03%01%06%08%2b%06%01%05%05%07%03%03"
|
||||
else:
|
||||
# server + email
|
||||
trust_ext_value = "0 %06%03U%1d%25%01%01%ff%04%160%14%06%08%2b%06%01%05%05%07%03%04%06%08%2b%06%01%05%05%07%03%01"
|
||||
else:
|
||||
if has_code_trust:
|
||||
# server + code
|
||||
trust_ext_value = "0 %06%03U%1d%25%01%01%ff%04%160%14%06%08%2b%06%01%05%05%07%03%01%06%08%2b%06%01%05%05%07%03%03"
|
||||
else:
|
||||
# server
|
||||
trust_ext_value = "0%16%06%03U%1d%25%01%01%ff%04%0c0%0a%06%08%2b%06%01%05%05%07%03%01"
|
||||
else:
|
||||
if has_email_trust:
|
||||
if has_code_trust:
|
||||
# email + code
|
||||
trust_ext_value = "0 %06%03U%1d%25%01%01%ff%04%160%14%06%08%2b%06%01%05%05%07%03%04%06%08%2b%06%01%05%05%07%03%03"
|
||||
else:
|
||||
# email
|
||||
trust_ext_value = "0%16%06%03U%1d%25%01%01%ff%04%0c0%0a%06%08%2b%06%01%05%05%07%03%04"
|
||||
else:
|
||||
if has_code_trust:
|
||||
# code
|
||||
trust_ext_value = "0%16%06%03U%1d%25%01%01%ff%04%0c0%0a%06%08%2b%06%01%05%05%07%03%03"
|
||||
else:
|
||||
# none
|
||||
trust_ext_value = "0%18%06%03U%1d%25%01%01%ff%04%0e0%0c%06%0a%2b%06%01%04%01%99w%06%0a%10"
|
||||
|
||||
# no 2.5.29.37 for neutral certificates
|
||||
if (is_distrusted or has_server_trust or has_email_trust or has_code_trust):
|
||||
write_cert_ext_to_file(f, trust_ext_oid, trust_ext_value, pk)
|
||||
|
||||
pk = ''
|
||||
f.write("\n")
|
||||
|
||||
f.write("[p11-kit-object-v1]\n")
|
||||
f.write("label: ");
|
||||
f.write(tobj['CKA_LABEL'])
|
||||
f.write("\n")
|
||||
if is_distrusted:
|
||||
f.write("x-distrusted: true\n")
|
||||
elif has_server_trust or has_email_trust or has_code_trust:
|
||||
f.write("trusted: true\n")
|
||||
else:
|
||||
f.write("trusted: false\n")
|
||||
|
||||
# requires p11-kit >= 0.23.4
|
||||
f.write("nss-mozilla-ca-policy: true\n")
|
||||
f.write("modifiable: false\n");
|
||||
|
||||
f.write("-----BEGIN CERTIFICATE-----\n")
|
||||
f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64)))
|
||||
f.write("\n-----END CERTIFICATE-----\n")
|
||||
f.write(cert_comment)
|
||||
f.write("\n")
|
||||
|
||||
else:
|
||||
f.write("[p11-kit-object-v1]\n")
|
||||
f.write("label: ");
|
||||
f.write(tobj['CKA_LABEL']);
|
||||
f.write("\n")
|
||||
f.write("class: certificate\n")
|
||||
f.write("certificate-type: x-509\n")
|
||||
f.write("modifiable: false\n");
|
||||
f.write("issuer: \"");
|
||||
f.write(urllib.quote(tobj['CKA_ISSUER']));
|
||||
f.write("\"\n")
|
||||
f.write("serial-number: \"");
|
||||
f.write(urllib.quote(tobj['CKA_SERIAL_NUMBER']));
|
||||
f.write("\"\n")
|
||||
if (tobj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_NOT_TRUSTED') or (tobj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_NOT_TRUSTED') or (tobj['CKA_TRUST_CODE_SIGNING'] == 'CKT_NSS_NOT_TRUSTED'):
|
||||
f.write("x-distrusted: true\n")
|
||||
f.write("\n\n")
|
||||
f.close()
|
||||
print " -> written as '%s', trust = %s, openssl-trust = %s, distrust = %s, openssl-distrust = %s" % (fname, trustbits, openssl_trustflags, distrustbits, openssl_distrustflags)
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,60 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef NSSCKBI_H
|
||||
#define NSSCKBI_H
|
||||
|
||||
/*
|
||||
* NSS BUILTINS Version numbers.
|
||||
*
|
||||
* These are the version numbers for the builtins module packaged with
|
||||
* this release on NSS. To determine the version numbers of the builtin
|
||||
* module you are using, use the appropriate PKCS #11 calls.
|
||||
*
|
||||
* These version numbers detail changes to the PKCS #11 interface. They map
|
||||
* to the PKCS #11 spec versions.
|
||||
*/
|
||||
#define NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR 2
|
||||
#define NSS_BUILTINS_CRYPTOKI_VERSION_MINOR 20
|
||||
|
||||
/* These version numbers detail the changes
|
||||
* to the list of trusted certificates.
|
||||
*
|
||||
* The NSS_BUILTINS_LIBRARY_VERSION_MINOR macro needs to be bumped
|
||||
* for each NSS minor release AND whenever we change the list of
|
||||
* trusted certificates. 10 minor versions are allocated for each
|
||||
* NSS 3.x branch as follows, allowing us to change the list of
|
||||
* trusted certificates up to 9 times on each branch.
|
||||
* - NSS 3.5 branch: 3-9
|
||||
* - NSS 3.6 branch: 10-19
|
||||
* - NSS 3.7 branch: 20-29
|
||||
* - NSS 3.8 branch: 30-39
|
||||
* - NSS 3.9 branch: 40-49
|
||||
* - NSS 3.10 branch: 50-59
|
||||
* - NSS 3.11 branch: 60-69
|
||||
* ...
|
||||
* - NSS 3.12 branch: 70-89
|
||||
* - NSS 3.13 branch: 90-99
|
||||
* - NSS 3.14 branch: 100-109
|
||||
* ...
|
||||
* - NSS 3.29 branch: 250-255
|
||||
*
|
||||
* NSS_BUILTINS_LIBRARY_VERSION_MINOR is a CK_BYTE. It's not clear
|
||||
* whether we may use its full range (0-255) or only 0-99 because
|
||||
* of the comment in the CK_VERSION type definition.
|
||||
*/
|
||||
#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
|
||||
#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 11
|
||||
#define NSS_BUILTINS_LIBRARY_VERSION "2.11"
|
||||
|
||||
/* These version numbers detail the semantic changes to the ckfw engine. */
|
||||
#define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
|
||||
#define NSS_BUILTINS_HARDWARE_VERSION_MINOR 0
|
||||
|
||||
/* These version numbers detail the semantic changes to ckbi itself
|
||||
* (new PKCS #11 objects), etc. */
|
||||
#define NSS_BUILTINS_FIRMWARE_VERSION_MAJOR 1
|
||||
#define NSS_BUILTINS_FIRMWARE_VERSION_MINOR 0
|
||||
|
||||
#endif /* NSSCKBI_H */
|
||||
@@ -1,8 +0,0 @@
|
||||
[p11-kit-object-v1]
|
||||
label: "Add missing BasicConstraints for Entrust root"
|
||||
id: "%55%e4%81%d1%11%80%be%d8%89%b9%08%a3%31%f9%a1%24%09%16%b9%70"
|
||||
x-public-key-info: "%30%82%01%22%30%0d%06%09%2a%86%48%86%f7%0d%01%01%01%05%00%03%82%01%0f%00%30%82%01%0a%02%82%01%01%00%ad%4d%4b%a9%12%86%b2%ea%a3%20%07%15%16%64%2a%2b%4b%d1%bf%0b%4a%4d%8e%ed%80%76%a5%67%b7%78%40%c0%73%42%c8%68%c0%db%53%2b%dd%5e%b8%76%98%35%93%8b%1a%9d%7c%13%3a%0e%1f%5b%b7%1e%cf%e5%24%14%1e%b1%81%a9%8d%7d%b8%cc%6b%4b%03%f1%02%0c%dc%ab%a5%40%24%00%7f%74%94%a1%9d%08%29%b3%88%0b%f5%87%77%9d%55%cd%e4%c3%7e%d7%6a%64%ab%85%14%86%95%5b%97%32%50%6f%3d%c8%ba%66%0c%e3%fc%bd%b8%49%c1%76%89%49%19%fd%c0%a8%bd%89%a3%67%2f%c6%9f%bc%71%19%60%b8%2d%e9%2c%c9%90%76%66%7b%94%e2%af%78%d6%65%53%5d%3c%d6%9c%b2%cf%29%03%f9%2f%a4%50%b2%d4%48%ce%05%32%55%8a%fd%b2%64%4c%0e%e4%98%07%75%db%7f%df%b9%08%55%60%85%30%29%f9%7b%48%a4%69%86%e3%35%3f%1e%86%5d%7a%7a%15%bd%ef%00%8e%15%22%54%17%00%90%26%93%bc%0e%49%68%91%bf%f8%47%d3%9d%95%42%c1%0e%4d%df%6f%26%cf%c3%18%21%62%66%43%70%d6%d5%c0%07%e1%02%03%01%00%01"
|
||||
class: x-certificate-extension
|
||||
object-id: 2.5.29.19
|
||||
value: "%30%0f%06%03%55%1d%13%01%01%ff%04%05%30%03%01%01%ff"
|
||||
|
||||
@@ -11,8 +11,8 @@ DEST=@PREFIX@/etc/pki/ca-trust/extracted
|
||||
|
||||
# OpenSSL PEM bundle that includes trust flags
|
||||
# (BEGIN TRUSTED CERTIFICATE)
|
||||
@PREFIX@/bin/p11-kit extract --format=openssl-bundle --filter=certificates --overwrite $DEST/openssl/ca-bundle.trust.crt
|
||||
@PREFIX@/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose server-auth $DEST/pem/tls-ca-bundle.pem
|
||||
@PREFIX@/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose email $DEST/pem/email-ca-bundle.pem
|
||||
@PREFIX@/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose code-signing $DEST/pem/objsign-ca-bundle.pem
|
||||
@PREFIX@/bin/p11-kit extract --format=openssl-bundle --filter=certificates --overwrite --comment $DEST/openssl/ca-bundle.trust.crt
|
||||
@PREFIX@/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --comment --purpose server-auth $DEST/pem/tls-ca-bundle.pem
|
||||
@PREFIX@/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --comment --purpose email $DEST/pem/email-ca-bundle.pem
|
||||
@PREFIX@/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --comment --purpose code-signing $DEST/pem/objsign-ca-bundle.pem
|
||||
@PREFIX@/bin/p11-kit extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth $DEST/java/cacerts
|
||||
Reference in new issue
Block a user