import ca-certificates-2018.2.24-6.el8
This commit is contained in:
CentOS Sources
commit
ec6024ff00
0
.ca-certificates.metadata
Normal file
0
.ca-certificates.metadata
Normal file
0
.gitignore
vendored
Normal file
0
.gitignore
vendored
Normal file
13
SOURCES/README.edk2
Normal file
13
SOURCES/README.edk2
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
This directory /etc/pki/ca-trust/extracted/edk2/ contains a
|
||||||
|
CA certificate bundle file which is automatically created
|
||||||
|
based on the information found in the
|
||||||
|
/usr/share/pki/ca-trust-source/ and /etc/pki/ca-trust/source/
|
||||||
|
directories.
|
||||||
|
|
||||||
|
The file is in the EDK2 (EFI Development Kit II) file format.
|
||||||
|
|
||||||
|
Please never manually edit the files stored in this directory,
|
||||||
|
because your changes will be lost and the files automatically overwritten,
|
||||||
|
each time the update-ca-trust command gets executed.
|
||||||
|
|
||||||
|
Please refer to the update-ca-trust(8) manual page for additional information.
|
||||||
4
SOURCES/README.etc
Normal file
4
SOURCES/README.etc
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
This directory /etc/pki/ca-trust is used by a system of consolidated
|
||||||
|
CA certificates.
|
||||||
|
|
||||||
|
Please refer to the update-ca-trust(8) manual page for additional information.
|
||||||
12
SOURCES/README.extr
Normal file
12
SOURCES/README.extr
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
This directory /etc/pki/ca-trust/extracted/ contains
|
||||||
|
CA certificate bundle files which are automatically created.
|
||||||
|
|
||||||
|
If your application isn't able to load the PKCS#11 module p11-kit-trust.so,
|
||||||
|
then you can use these files in your application to load a list of global
|
||||||
|
root CA certificates.
|
||||||
|
|
||||||
|
Please never manually edit the files stored in this directory,
|
||||||
|
because your changes will be lost and the files automatically overwritten,
|
||||||
|
each time the update-ca-trust command gets executed.
|
||||||
|
|
||||||
|
Please refer to the update-ca-trust(8) manual page for additional information.
|
||||||
17
SOURCES/README.java
Normal file
17
SOURCES/README.java
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
This directory /etc/pki/ca-trust/extracted/java/ contains
|
||||||
|
CA certificate bundle files which are automatically created
|
||||||
|
based on the information found in the
|
||||||
|
/usr/share/pki/ca-trust-source/ and /etc/pki/ca-trust/source/
|
||||||
|
directories.
|
||||||
|
|
||||||
|
All files are in the java keystore file format.
|
||||||
|
|
||||||
|
If your application isn't able to load the PKCS#11 module p11-kit-trust.so,
|
||||||
|
then you can use these files in your application to load a list of global
|
||||||
|
root CA certificates.
|
||||||
|
|
||||||
|
Please never manually edit the files stored in this directory,
|
||||||
|
because your changes will be lost and the files automatically overwritten,
|
||||||
|
each time the update-ca-trust command gets executed.
|
||||||
|
|
||||||
|
Please refer to the update-ca-trust(8) manual page for additional information.
|
||||||
18
SOURCES/README.openssl
Normal file
18
SOURCES/README.openssl
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
This directory /etc/pki/ca-trust/extracted/openssl/ contains
|
||||||
|
CA certificate bundle files which are automatically created
|
||||||
|
based on the information found in the
|
||||||
|
/usr/share/pki/ca-trust-source/ and /etc/pki/ca-trust/source/
|
||||||
|
directories.
|
||||||
|
|
||||||
|
All files are in the BEGIN/END TRUSTED CERTIFICATE file format,
|
||||||
|
as described in the x509(1) manual page.
|
||||||
|
|
||||||
|
If your application isn't able to load the PKCS#11 module p11-kit-trust.so,
|
||||||
|
then you can use these files in your application to load a list of global
|
||||||
|
root CA certificates.
|
||||||
|
|
||||||
|
Please never manually edit the files stored in this directory,
|
||||||
|
because your changes will be lost and the files automatically overwritten,
|
||||||
|
each time the update-ca-trust command gets executed.
|
||||||
|
|
||||||
|
Please refer to the update-ca-trust(8) manual page for additional information.
|
||||||
21
SOURCES/README.pem
Normal file
21
SOURCES/README.pem
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
This directory /etc/pki/ca-trust/extracted/pem/ contains
|
||||||
|
CA certificate bundle files which are automatically created
|
||||||
|
based on the information found in the
|
||||||
|
/usr/share/pki/ca-trust-source/ and /etc/pki/ca-trust/source/
|
||||||
|
directories.
|
||||||
|
|
||||||
|
All files are in the BEGIN/END CERTIFICATE file format,
|
||||||
|
as described in the x509(1) manual page.
|
||||||
|
|
||||||
|
Distrust information cannot be represented in this file format,
|
||||||
|
and distrusted certificates are missing from these files.
|
||||||
|
|
||||||
|
If your application isn't able to load the PKCS#11 module p11-kit-trust.so,
|
||||||
|
then you can use these files in your application to load a list of global
|
||||||
|
root CA certificates.
|
||||||
|
|
||||||
|
Please never manually edit the files stored in this directory,
|
||||||
|
because your changes will be lost and the files automatically overwritten,
|
||||||
|
each time the update-ca-trust command gets executed.
|
||||||
|
|
||||||
|
Please refer to the update-ca-trust(8) manual page for additional information.
|
||||||
20
SOURCES/README.src
Normal file
20
SOURCES/README.src
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
This directory /etc/pki/ca-trust/source/ contains CA certificates and
|
||||||
|
trust settings in the PEM file format. The trust settings found here will be
|
||||||
|
interpreted with a high priority - higher than the ones found in
|
||||||
|
/usr/share/pki/ca-trust-source/.
|
||||||
|
|
||||||
|
=============================================================================
|
||||||
|
QUICK HELP: To add a certificate in the simple PEM or DER file formats to the
|
||||||
|
list of CAs trusted on the system:
|
||||||
|
|
||||||
|
Copy it to the
|
||||||
|
/etc/pki/ca-trust/source/anchors/
|
||||||
|
subdirectory, and run the
|
||||||
|
update-ca-trust
|
||||||
|
command.
|
||||||
|
|
||||||
|
If your certificate is in the extended BEGIN TRUSTED file format,
|
||||||
|
then place it into the main source/ directory instead.
|
||||||
|
=============================================================================
|
||||||
|
|
||||||
|
Please refer to the update-ca-trust(8) manual page for additional information.
|
||||||
20
SOURCES/README.usr
Normal file
20
SOURCES/README.usr
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
This directory /usr/share/pki/ca-trust-source/ contains CA certificates and
|
||||||
|
trust settings in the PEM file format. The trust settings found here will be
|
||||||
|
interpreted with a low priority - lower than the ones found in
|
||||||
|
/etc/pki/ca-trust/source/ .
|
||||||
|
|
||||||
|
=============================================================================
|
||||||
|
QUICK HELP: To add a certificate in the simple PEM or DER file formats to the
|
||||||
|
list of CAs trusted on the system:
|
||||||
|
|
||||||
|
Copy it to the
|
||||||
|
/usr/share/pki/ca-trust-source/anchors/
|
||||||
|
subdirectory, and run the
|
||||||
|
update-ca-trust
|
||||||
|
command.
|
||||||
|
|
||||||
|
If your certificate is in the extended BEGIN TRUSTED file format,
|
||||||
|
then place it into the main source/ directory instead.
|
||||||
|
=============================================================================
|
||||||
|
|
||||||
|
Please refer to the update-ca-trust(8) manual page for additional information.
|
||||||
87
SOURCES/ca-legacy
Normal file
87
SOURCES/ca-legacy
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#set -vx
|
||||||
|
|
||||||
|
LCFILE=/etc/pki/ca-trust/ca-legacy.conf
|
||||||
|
LLINK=/etc/pki/ca-trust/source/ca-bundle.legacy.crt
|
||||||
|
LDEFAULT=/usr/share/pki/ca-trust-legacy/ca-bundle.legacy.default.crt
|
||||||
|
LDISABLE=/usr/share/pki/ca-trust-legacy/ca-bundle.legacy.disable.crt
|
||||||
|
|
||||||
|
# An absent value, or any unexpected value, is treated as "default".
|
||||||
|
is_disabled()
|
||||||
|
{
|
||||||
|
grep -i "^legacy *= *disable *$" $LCFILE >/dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
|
do_check()
|
||||||
|
{
|
||||||
|
is_disabled
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
echo "Legacy CAs are set to DISABLED in file $LCFILE (affects install/upgrade)"
|
||||||
|
LEXPECT=$LDISABLE
|
||||||
|
else
|
||||||
|
echo "Legacy CAs are set to DEFAULT in file $LCFILE (affects install/upgrade)"
|
||||||
|
LEXPECT=$LDEFAULT
|
||||||
|
fi
|
||||||
|
echo "Status of symbolic link $LLINK:"
|
||||||
|
readlink -v $LLINK
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install()
|
||||||
|
{
|
||||||
|
is_disabled
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
# found, legacy is disabled
|
||||||
|
ln -sf $LDISABLE $LLINK
|
||||||
|
else
|
||||||
|
# expression not found, legacy is set to default
|
||||||
|
ln -sf $LDEFAULT $LLINK
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
do_default()
|
||||||
|
{
|
||||||
|
sed -i 's/^legacy *=.*$/legacy=default/' $LCFILE
|
||||||
|
do_install
|
||||||
|
/usr/bin/update-ca-trust
|
||||||
|
}
|
||||||
|
|
||||||
|
do_disable()
|
||||||
|
{
|
||||||
|
sed -i 's/^legacy *=.*$/legacy=disable/' $LCFILE
|
||||||
|
do_install
|
||||||
|
/usr/bin/update-ca-trust
|
||||||
|
}
|
||||||
|
|
||||||
|
do_help()
|
||||||
|
{
|
||||||
|
echo "usage: $0 [check | default | disable | install]"
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ $# -eq 0 ]]; then
|
||||||
|
# no parameters
|
||||||
|
do_help
|
||||||
|
exit $?
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$1" = "install" ]]; then
|
||||||
|
do_install
|
||||||
|
exit $?
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$1" = "default" ]]; then
|
||||||
|
do_default
|
||||||
|
exit $?
|
||||||
|
fi
|
||||||
|
if [[ "$1" = "disable" ]]; then
|
||||||
|
do_disable
|
||||||
|
exit $?
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$1" = "check" ]]; then
|
||||||
|
do_check
|
||||||
|
exit $?
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$0: Unsupported command $1"
|
||||||
|
do_help
|
||||||
85
SOURCES/ca-legacy.8.txt
Normal file
85
SOURCES/ca-legacy.8.txt
Normal file
@ -0,0 +1,85 @@
|
|||||||
|
////
|
||||||
|
Copyright (C) 2013 Red Hat, Inc.
|
||||||
|
|
||||||
|
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.
|
||||||
|
////
|
||||||
|
|
||||||
|
|
||||||
|
ca-legacy(8)
|
||||||
|
============
|
||||||
|
:doctype: manpage
|
||||||
|
:man source: ca-legacy
|
||||||
|
|
||||||
|
|
||||||
|
NAME
|
||||||
|
----
|
||||||
|
ca-legacy - Manage the system configuration for legacy CA certificates
|
||||||
|
|
||||||
|
|
||||||
|
SYNOPSIS
|
||||||
|
--------
|
||||||
|
*ca-legacy* ['COMMAND']
|
||||||
|
|
||||||
|
|
||||||
|
DESCRIPTION
|
||||||
|
-----------
|
||||||
|
ca-legacy(8) is used to include or exclude a set of legacy Certificate Authority (CA)
|
||||||
|
certificates in the system's list of trusted CA certificates.
|
||||||
|
|
||||||
|
The list of CA certificates and trust flags included in the ca-certificates package
|
||||||
|
are based on the decisions made by Mozilla.org according to the Mozilla CA policy.
|
||||||
|
|
||||||
|
Occasionally, removal or distrust decisions made by Mozilla.org might be incompatible with the requirements
|
||||||
|
or limitations of some applications that also use the CA certificates list in the Linux environment.
|
||||||
|
|
||||||
|
The ca-certificates package might keep some CA certificates included and trusted by default,
|
||||||
|
as long as it is seen necessary by the maintainers, despite the fact that they have
|
||||||
|
been removed by Mozilla. These certificates are called legacy CA certificates.
|
||||||
|
|
||||||
|
The general requirements to keep legacy CA certificates included and trusted might change over time,
|
||||||
|
for example if functional limitations of software packages have been resolved.
|
||||||
|
Future versions of the ca-certificates package might reduce the set of legacy CA certificates
|
||||||
|
that are included and trusted by default.
|
||||||
|
|
||||||
|
The ca-legacy(8) command can be used to override the default behaviour.
|
||||||
|
|
||||||
|
The mechanisms to individually trust or distrust CA certificates as described in update-ca-trust(8) still apply.
|
||||||
|
|
||||||
|
|
||||||
|
COMMANDS
|
||||||
|
--------
|
||||||
|
*check*::
|
||||||
|
The current configuration will be shown.
|
||||||
|
|
||||||
|
*default*::
|
||||||
|
Configure the system to use the default configuration, as recommended
|
||||||
|
by the package maintainers.
|
||||||
|
|
||||||
|
*disable*::
|
||||||
|
Configure the system to explicitly disable legacy CA certificates.
|
||||||
|
Using this configuration, the system will use the set of
|
||||||
|
included and trusted CA certificates as released by Mozilla.
|
||||||
|
|
||||||
|
*install*::
|
||||||
|
The configuration file will be read and the system configuration
|
||||||
|
will be set accordingly. This command is executed automatically during
|
||||||
|
upgrades of the ca-certificates package.
|
||||||
|
|
||||||
|
|
||||||
|
FILES
|
||||||
|
-----
|
||||||
|
/etc/pki/ca-trust/ca-legacy.conf::
|
||||||
|
A configuration file that will be used and modified by the ca-legacy command.
|
||||||
|
The contents of the configuration file will be read on package upgrades.
|
||||||
|
|
||||||
|
AUTHOR
|
||||||
|
------
|
||||||
|
Written by Kai Engert.
|
||||||
24
SOURCES/ca-legacy.conf
Normal file
24
SOURCES/ca-legacy.conf
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
# The upstream Mozilla.org project tests all changes to the root CA
|
||||||
|
# list with the NSS (Network Security Services) library.
|
||||||
|
#
|
||||||
|
# Occassionally, changes might cause compatibility issues with
|
||||||
|
# other cryptographic libraries, such as openssl or gnutls.
|
||||||
|
#
|
||||||
|
# The package maintainers of the CA certificates package might decide
|
||||||
|
# to temporarily keep certain (legacy) root CA certificates trusted,
|
||||||
|
# until incompatibility issues can be resolved.
|
||||||
|
#
|
||||||
|
# Using this configuration file it is possible to opt-out of the
|
||||||
|
# compatibility choices made by the package maintainer.
|
||||||
|
#
|
||||||
|
# legacy=default :
|
||||||
|
# This configuration uses the choices made by the package maintainer.
|
||||||
|
# It may keep root CA certificate as trusted, which the upstream
|
||||||
|
# Mozilla.org project has already marked as no longer trusted.
|
||||||
|
# The set of CA certificates that are being kept enabled may change
|
||||||
|
# between package versions.
|
||||||
|
#
|
||||||
|
# legacy=disable :
|
||||||
|
# Follow all removal decisions made by Mozilla.org
|
||||||
|
#
|
||||||
|
legacy=default
|
||||||
22995
SOURCES/certdata.txt
Normal file
22995
SOURCES/certdata.txt
Normal file
File diff suppressed because it is too large
Load Diff
398
SOURCES/certdata2pem.py
Normal file
398
SOURCES/certdata2pem.py
Normal file
@ -0,0 +1,398 @@
|
|||||||
|
#!/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.request, urllib.parse, urllib.error
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
objects = []
|
||||||
|
|
||||||
|
def printable_serial(obj):
|
||||||
|
return ".".join([str(x) for x in obj['CKA_SERIAL_NUMBER']])
|
||||||
|
|
||||||
|
# Dirty file parser.
|
||||||
|
in_data, in_multiline, in_obj = False, False, False
|
||||||
|
field, ftype, value, binval, obj = None, None, None, bytearray(), 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 ftype == 'MULTILINE_OCTAL':
|
||||||
|
line = line.strip()
|
||||||
|
for i in re.finditer(r'\\([0-3][0-7][0-7])', line):
|
||||||
|
integ = int(i.group(1), 8)
|
||||||
|
binval.extend((integ).to_bytes(1, sys.byteorder))
|
||||||
|
obj[field] = binval
|
||||||
|
else:
|
||||||
|
value += line
|
||||||
|
obj[field] = value
|
||||||
|
continue
|
||||||
|
in_multiline = False
|
||||||
|
continue
|
||||||
|
if line.startswith('CKA_CLASS'):
|
||||||
|
in_obj = True
|
||||||
|
line_parts = line.strip().split(' ', 2)
|
||||||
|
if len(line_parts) > 2:
|
||||||
|
field, ftype = line_parts[0:2]
|
||||||
|
value = ' '.join(line_parts[2:])
|
||||||
|
elif len(line_parts) == 2:
|
||||||
|
field, ftype = line_parts
|
||||||
|
value = None
|
||||||
|
else:
|
||||||
|
raise NotImplementedError('line_parts < 2 not supported.\n' + line)
|
||||||
|
if ftype == 'MULTILINE_OCTAL':
|
||||||
|
in_multiline = True
|
||||||
|
value = ""
|
||||||
|
binval = bytearray()
|
||||||
|
continue
|
||||||
|
obj[field] = value
|
||||||
|
if len(list(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(',', '_')
|
||||||
|
labelbytes = bytearray()
|
||||||
|
i = 0
|
||||||
|
imax = len(label)
|
||||||
|
while i < imax:
|
||||||
|
if i < imax-3 and label[i] == '\\' and label[i+1] == 'x':
|
||||||
|
labelbytes.extend(bytes.fromhex(label[i+2:i+4]))
|
||||||
|
i += 4
|
||||||
|
continue
|
||||||
|
labelbytes.extend(str.encode(label[i]))
|
||||||
|
i = i+1
|
||||||
|
continue
|
||||||
|
label = labelbytes.decode('utf-8')
|
||||||
|
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 list(trust_types.keys()):
|
||||||
|
if t in tobj and tobj[t] == 'CKT_NSS_TRUSTED_DELEGATOR':
|
||||||
|
trustbits.append(t)
|
||||||
|
if t in openssl_trust:
|
||||||
|
openssl_trustflags.append(openssl_trust[t])
|
||||||
|
if t in tobj and tobj[t] == 'CKT_NSS_NOT_TRUSTED':
|
||||||
|
distrustbits.append(t)
|
||||||
|
if t in openssl_trust:
|
||||||
|
openssl_distrustflags.append(openssl_trust[t])
|
||||||
|
|
||||||
|
for t in list(legacy_trust_types.keys()):
|
||||||
|
if t in tobj 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 t in tobj 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 'LEGACY_CKA_TRUST_SERVER_AUTH' in tobj or 'LEGACY_CKA_TRUST_EMAIL_PROTECTION' in tobj or 'LEGACY_CKA_TRUST_CODE_SIGNING' in tobj:
|
||||||
|
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")
|
||||||
|
temp_encoded_b64 = base64.b64encode(obj['CKA_VALUE'])
|
||||||
|
temp_wrapped = textwrap.wrap(temp_encoded_b64.decode(), 64)
|
||||||
|
f.write("\n".join(temp_wrapped))
|
||||||
|
f.write("\n-----END CERTIFICATE-----\n")
|
||||||
|
f.close()
|
||||||
|
|
||||||
|
if 'CKA_TRUST_SERVER_AUTH' in tobj or 'CKA_TRUST_EMAIL_PROTECTION' in tobj or 'CKA_TRUST_CODE_SIGNING' in tobj:
|
||||||
|
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")
|
||||||
|
temp_encoded_b64 = base64.b64encode(obj['CKA_VALUE'])
|
||||||
|
temp_wrapped = textwrap.wrap(temp_encoded_b64.decode(), 64)
|
||||||
|
fc.write("\n".join(temp_wrapped))
|
||||||
|
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", errors = 'replace') 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 'CKA_TRUST_SERVER_AUTH' in tobj:
|
||||||
|
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 'CKA_TRUST_EMAIL_PROTECTION' in tobj:
|
||||||
|
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 'CKA_TRUST_CODE_SIGNING' in tobj:
|
||||||
|
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")
|
||||||
|
temp_encoded_b64 = base64.b64encode(obj['CKA_VALUE'])
|
||||||
|
temp_wrapped = textwrap.wrap(temp_encoded_b64.decode(), 64)
|
||||||
|
f.write("\n".join(temp_wrapped))
|
||||||
|
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.parse.quote(tobj['CKA_ISSUER']));
|
||||||
|
f.write("\"\n")
|
||||||
|
f.write("serial-number: \"");
|
||||||
|
f.write(urllib.parse.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))
|
||||||
61
SOURCES/nssckbi.h
Normal file
61
SOURCES/nssckbi.h
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
/* 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
|
||||||
|
* whenever we change the list of trusted certificates.
|
||||||
|
*
|
||||||
|
* Please use the following rules when increasing the version number:
|
||||||
|
*
|
||||||
|
* - starting with version 2.14, NSS_BUILTINS_LIBRARY_VERSION_MINOR
|
||||||
|
* must always be an EVEN number (e.g. 16, 18, 20 etc.)
|
||||||
|
*
|
||||||
|
* - whenever possible, if older branches require a modification to the
|
||||||
|
* list, these changes should be made on the main line of development (trunk),
|
||||||
|
* and the older branches should update to the most recent list.
|
||||||
|
*
|
||||||
|
* - ODD minor version numbers are reserved to indicate a snapshot that has
|
||||||
|
* deviated from the main line of development, e.g. if it was necessary
|
||||||
|
* to modify the list on a stable branch.
|
||||||
|
* Once the version has been changed to an odd number (e.g. 2.13) on a branch,
|
||||||
|
* it should remain unchanged on that branch, even if further changes are
|
||||||
|
* made on that branch.
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
* It's recommend to switch back to 0 after having reached version 98/99.
|
||||||
|
*/
|
||||||
|
#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
|
||||||
|
#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 24
|
||||||
|
#define NSS_BUILTINS_LIBRARY_VERSION "2.24"
|
||||||
|
|
||||||
|
/* 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
SOURCES/trust-fixes
Normal file
1
SOURCES/trust-fixes
Normal file
@ -0,0 +1 @@
|
|||||||
|
|
||||||
22
SOURCES/update-ca-trust
Normal file
22
SOURCES/update-ca-trust
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#set -vx
|
||||||
|
|
||||||
|
# At this time, while this script is trivial, we ignore any parameters given.
|
||||||
|
# However, for backwards compatibility reasons, future versions of this script must
|
||||||
|
# support the syntax "update-ca-trust extract" trigger the generation of output
|
||||||
|
# files in $DEST.
|
||||||
|
|
||||||
|
DEST=/etc/pki/ca-trust/extracted
|
||||||
|
|
||||||
|
# Prevent p11-kit from reading user configuration files.
|
||||||
|
export P11_KIT_NO_USER_CONFIG=1
|
||||||
|
|
||||||
|
# OpenSSL PEM bundle that includes trust flags
|
||||||
|
# (BEGIN TRUSTED CERTIFICATE)
|
||||||
|
/usr/bin/p11-kit extract --format=openssl-bundle --filter=certificates --overwrite --comment $DEST/openssl/ca-bundle.trust.crt
|
||||||
|
/usr/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --comment --purpose server-auth $DEST/pem/tls-ca-bundle.pem
|
||||||
|
/usr/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --comment --purpose email $DEST/pem/email-ca-bundle.pem
|
||||||
|
/usr/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --comment --purpose code-signing $DEST/pem/objsign-ca-bundle.pem
|
||||||
|
/usr/bin/p11-kit extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth $DEST/java/cacerts
|
||||||
|
/usr/bin/p11-kit extract --format=edk2-cacerts --filter=ca-anchors --overwrite --purpose=server-auth $DEST/edk2/cacerts.bin
|
||||||
254
SOURCES/update-ca-trust.8.txt
Normal file
254
SOURCES/update-ca-trust.8.txt
Normal file
@ -0,0 +1,254 @@
|
|||||||
|
////
|
||||||
|
Copyright (C) 2013 Red Hat, Inc.
|
||||||
|
|
||||||
|
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.
|
||||||
|
////
|
||||||
|
|
||||||
|
|
||||||
|
update-ca-trust(8)
|
||||||
|
==================
|
||||||
|
:doctype: manpage
|
||||||
|
:man source: update-ca-trust
|
||||||
|
|
||||||
|
|
||||||
|
NAME
|
||||||
|
----
|
||||||
|
update-ca-trust - manage consolidated and dynamic configuration of CA
|
||||||
|
certificates and associated trust
|
||||||
|
|
||||||
|
|
||||||
|
SYNOPSIS
|
||||||
|
--------
|
||||||
|
*update-ca-trust* ['COMMAND']
|
||||||
|
|
||||||
|
|
||||||
|
DESCRIPTION
|
||||||
|
-----------
|
||||||
|
update-ca-trust(8) is used to manage a consolidated and dynamic configuration
|
||||||
|
feature of Certificate Authority (CA) certificates and associated trust.
|
||||||
|
|
||||||
|
The feature is available for new applications that read the
|
||||||
|
consolidated configuration files found in the /etc/pki/ca-trust/extracted directory
|
||||||
|
or that load the PKCS#11 module p11-kit-trust.so
|
||||||
|
|
||||||
|
Parts of the new feature are also provided in a way to make it useful
|
||||||
|
for legacy applications.
|
||||||
|
|
||||||
|
Many legacy applications expect CA certificates and trust configuration
|
||||||
|
in a fixed location, contained in files with particular path and name,
|
||||||
|
or by referring to a classic PKCS#11 trust module provided by the
|
||||||
|
NSS cryptographic library.
|
||||||
|
|
||||||
|
The dynamic configuration feature provides functionally compatible replacements
|
||||||
|
for classic configuration files and for the classic NSS trust module named libnssckbi.
|
||||||
|
|
||||||
|
In order to enable legacy applications, that read the classic files or
|
||||||
|
access the classic module, to make use of the new consolidated and dynamic configuration
|
||||||
|
feature, the classic filenames have been changed to symbolic links.
|
||||||
|
The symbolic links refer to dynamically created and consolidated
|
||||||
|
output stored below the /etc/pki/ca-trust/extracted directory hierarchy.
|
||||||
|
|
||||||
|
The output is produced using the 'update-ca-trust' command (without parameters),
|
||||||
|
or using the 'update-ca-trust extract' command.
|
||||||
|
In order to produce the output, a flexible set of source configuration
|
||||||
|
is read, as described in section <<sourceconf,SOURCE CONFIGURATION>>.
|
||||||
|
|
||||||
|
In addition, the classic PKCS#11 module
|
||||||
|
is replaced with a new PKCS#11 module (p11-kit-trust.so) that dynamically
|
||||||
|
reads the same source configuration.
|
||||||
|
|
||||||
|
|
||||||
|
[[sourceconf]]
|
||||||
|
SOURCE CONFIGURATION
|
||||||
|
--------------------
|
||||||
|
The dynamic configuration feature uses several source directories that
|
||||||
|
will be scanned for any number of source files. *It is important to select
|
||||||
|
the correct subdirectory for adding files, as the subdirectory defines how
|
||||||
|
contained certificates will be trusted or distrusted, and which file formats are read.*
|
||||||
|
|
||||||
|
Files in *subdirectories below the directory hierarchy /usr/share/pki/ca-trust-source/* contain CA certificates and
|
||||||
|
trust settings in the PEM file format. The trust settings found here will be
|
||||||
|
interpreted with a *low priority*.
|
||||||
|
|
||||||
|
Files in *subdirectories below the directory hierarchy /etc/pki/ca-trust/source/* contain CA certificates and
|
||||||
|
trust settings in the PEM file format. The trust settings found here will be
|
||||||
|
interpreted with a *high priority*.
|
||||||
|
|
||||||
|
.You may use the following rules of thumb to decide, whether your configuration files should be added to the /etc or rather to the /usr directory hierarchy:
|
||||||
|
* If you are manually adding a configuration file to a system, you probably
|
||||||
|
want it to override any other default configuration, and you most likely should
|
||||||
|
add it to the respective subdirectory in the /etc hierarchy.
|
||||||
|
* If you are creating a package that provides additional root CA certificates,
|
||||||
|
that is intended for distribution to several computer systems, but you still
|
||||||
|
want to allow the administrator to override your list, then your package should
|
||||||
|
add your files to the respective subdirectory in the /usr hierarchy.
|
||||||
|
* If you are creating a package that is supposed to override the default system
|
||||||
|
trust settings, that is intended for distribution to several computer systems, then your package should install the files to the respective
|
||||||
|
subdirectory in the /etc hierarchy.
|
||||||
|
|
||||||
|
.*QUICK HELP 1*: To add a certificate in the simple PEM or DER file formats to the list of CAs trusted on the system:
|
||||||
|
* add it as a new file to directory /etc/pki/ca-trust/source/anchors/
|
||||||
|
* run 'update-ca-trust extract'
|
||||||
|
|
||||||
|
.*QUICK HELP 2*: If your certificate is in the extended BEGIN TRUSTED file format (which may contain distrust/blacklist trust flags, or trust flags for usages other than TLS) then:
|
||||||
|
* add it as a new file to directory /etc/pki/ca-trust/source/
|
||||||
|
* run 'update-ca-trust extract'
|
||||||
|
|
||||||
|
.In order to offer simplicity and flexibility, the way certificate files are treated depends on the subdirectory they are installed to.
|
||||||
|
* simple trust anchors subdirectory: /usr/share/pki/ca-trust-source/anchors/ or /etc/pki/ca-trust/source/anchors/
|
||||||
|
* simple blacklist (distrust) subdirectory: /usr/share/pki/ca-trust-source/blacklist/ or /etc/pki/ca-trust/source/blacklist/
|
||||||
|
* extended format directory: /usr/share/pki/ca-trust-source/ or /etc/pki/ca-trust/source/
|
||||||
|
|
||||||
|
.In the main directories /usr/share/pki/ca-trust-source/ or /etc/pki/ca-trust/source/ you may install one or multiple files in the following file formats:
|
||||||
|
* certificate files that include trust flags,
|
||||||
|
in the BEGIN/END TRUSTED CERTIFICATE file format
|
||||||
|
(any file name), which have been created using the openssl x509 tool
|
||||||
|
and the -addreject -addtrust options.
|
||||||
|
Bundle files with multiple certificates are supported.
|
||||||
|
* files in the p11-kit file format using the .p11-kit file name
|
||||||
|
extension, which can (e.g.) be used to distrust certificates
|
||||||
|
based on serial number and issuer name, without having the
|
||||||
|
full certificate available.
|
||||||
|
(This is currently an undocumented format, to be extended later.
|
||||||
|
For examples of the supported formats, see the files
|
||||||
|
shipped with the ca-certificates package.)
|
||||||
|
* certificate files without trust flags in either the DER file format or in
|
||||||
|
the PEM (BEGIN/END CERTIFICATE) file format (any file name). Such files
|
||||||
|
will be added with neutral trust, neither trusted nor distrusted.
|
||||||
|
They will simply be known to the system, which might be helpful to
|
||||||
|
assist cryptographic software in constructing chains of certificates.
|
||||||
|
(If you want a CA certificate in these file formats to be trusted, you
|
||||||
|
should remove it from this directory and move it to the
|
||||||
|
./anchors subdirectory instead.)
|
||||||
|
|
||||||
|
In the anchors subdirectories /usr/share/pki/ca-trust-source/anchors/ or /etc/pki/ca-trust/source/anchors/
|
||||||
|
you may install one or multiple certificates in either the DER file
|
||||||
|
format or in the PEM (BEGIN/END CERTIFICATE) file format.
|
||||||
|
Each certificate will be treated as *trusted* for all purposes.
|
||||||
|
|
||||||
|
In the blacklist subdirectories /usr/share/pki/ca-trust-source/blacklist/ or /etc/pki/ca-trust/source/blacklist/
|
||||||
|
you may install one or multiple certificates in either the DER file
|
||||||
|
format or in the PEM (BEGIN/END CERTIFICATE) file format.
|
||||||
|
Each certificate will be treated as *distrusted* for all purposes.
|
||||||
|
|
||||||
|
Please refer to the x509(1) manual page for the documentation of the
|
||||||
|
BEGIN/END CERTIFICATE and BEGIN/END TRUSTED CERTIFICATE file formats.
|
||||||
|
|
||||||
|
Applications that rely on a static file for a list of trusted CAs
|
||||||
|
may load one of the files found in the /etc/pki/ca-trust/extracted
|
||||||
|
directory. After modifying any file in the
|
||||||
|
/usr/share/pki/ca-trust-source/ or /etc/pki/ca-trust/source/
|
||||||
|
directories or in any of their subdirectories, or after adding a file,
|
||||||
|
it is necessary to run the 'update-ca-trust extract' command,
|
||||||
|
in order to update the consolidated files in /etc/pki/ca-trust/extracted/ .
|
||||||
|
|
||||||
|
Applications that load the classic PKCS#11 module using filename libnssckbi.so
|
||||||
|
(which has been converted into a symbolic link pointing to the new module)
|
||||||
|
and any application capable of
|
||||||
|
loading PKCS#11 modules and loading p11-kit-trust.so, will benefit from
|
||||||
|
the dynamically merged set of certificates and trust information stored in the
|
||||||
|
/usr/share/pki/ca-trust-source/ and /etc/pki/ca-trust/source/ directories.
|
||||||
|
|
||||||
|
|
||||||
|
[[extractconf]]
|
||||||
|
EXTRACTED CONFIGURATION
|
||||||
|
-----------------------
|
||||||
|
The directory /etc/pki/ca-trust/extracted/ contains generated CA certificate
|
||||||
|
bundle files which are created and updated, based on the <<sourceconf,SOURCE CONFIGURATION>>
|
||||||
|
by running the 'update-ca-trust extract' command.
|
||||||
|
|
||||||
|
If your application isn't able to load the PKCS#11 module p11-kit-trust.so,
|
||||||
|
then you can use these files in your application to load a list of global
|
||||||
|
root CA certificates.
|
||||||
|
|
||||||
|
Please never manually edit the files stored in this directory,
|
||||||
|
because your changes will be lost and the files automatically overwritten,
|
||||||
|
each time the 'update-ca-trust extract' command gets executed.
|
||||||
|
|
||||||
|
In order to install new trusted or distrusted certificates,
|
||||||
|
please rather install them in the respective subdirectory below the
|
||||||
|
/usr/share/pki/ca-trust-source/ or /etc/pki/ca-trust/source/
|
||||||
|
directories, as described in the <<sourceconf,SOURCE CONFIGURATION>> section.
|
||||||
|
|
||||||
|
The directory /etc/pki/ca-trust/extracted/java/ contains
|
||||||
|
a CA certificate bundle in the java keystore file format.
|
||||||
|
Distrust information cannot be represented in this file format,
|
||||||
|
and distrusted certificates are missing from these files.
|
||||||
|
File cacerts contains CA certificates trusted for TLS server authentication.
|
||||||
|
|
||||||
|
The directory /etc/pki/ca-trust/extracted/openssl/ contains
|
||||||
|
CA certificate bundle files in the extended BEGIN/END TRUSTED CERTIFICATE file format,
|
||||||
|
as described in the x509(1) manual page.
|
||||||
|
File ca-bundle.trust.crt contains the full set of all trusted
|
||||||
|
or distrusted certificates, including the associated trust flags.
|
||||||
|
|
||||||
|
The directory /etc/pki/ca-trust/extracted/pem/ contains
|
||||||
|
CA certificate bundle files in the simple BEGIN/END CERTIFICATE file format,
|
||||||
|
as described in the x509(1) manual page.
|
||||||
|
Distrust information cannot be represented in this file format,
|
||||||
|
and distrusted certificates are missing from these files.
|
||||||
|
File tls-ca-bundle.pem contains CA certificates
|
||||||
|
trusted for TLS server authentication.
|
||||||
|
File email-ca-bundle.pem contains CA certificates
|
||||||
|
trusted for E-Mail protection.
|
||||||
|
File objsign-ca-bundle.pem contains CA certificates
|
||||||
|
trusted for code signing.
|
||||||
|
|
||||||
|
The directory /etc/pki/ca-trust/extracted/edk2/ contains a CA
|
||||||
|
certificate bundle ("cacerts.bin") in the "sequence of
|
||||||
|
EFI_SIGNATURE_LISTs" format, defined in the UEFI-2.7 specification,
|
||||||
|
sections "31.4.1 Signature Database" and
|
||||||
|
"EFI_CERT_X509_GUID". Distrust information cannot be represented in
|
||||||
|
this file format, and distrusted certificates are missing from these
|
||||||
|
files. File "cacerts.bin" contains CA certificates trusted for TLS
|
||||||
|
server authentication.
|
||||||
|
|
||||||
|
|
||||||
|
COMMANDS
|
||||||
|
--------
|
||||||
|
(absent/empty command)::
|
||||||
|
Same as the *extract* command described below. (However, the command may
|
||||||
|
print fewer warnings, as this command is being run during rpm package
|
||||||
|
installation, where non-fatal status output is undesired.)
|
||||||
|
|
||||||
|
*extract*::
|
||||||
|
Instruct update-ca-trust to scan the <<sourceconf,SOURCE CONFIGURATION>> and produce
|
||||||
|
updated versions of the consolidated configuration files stored below
|
||||||
|
the /etc/pki/ca-trust/extracted directory hierarchy.
|
||||||
|
|
||||||
|
FILES
|
||||||
|
-----
|
||||||
|
/etc/pki/tls/certs/ca-bundle.crt::
|
||||||
|
Classic filename, file contains a list of CA certificates trusted for TLS server authentication usage, in the simple BEGIN/END CERTIFICATE file format, without distrust information.
|
||||||
|
This file is a symbolic link that refers to the consolidated output created by the update-ca-trust command.
|
||||||
|
|
||||||
|
/etc/pki/tls/certs/ca-bundle.trust.crt::
|
||||||
|
Classic filename, file contains a list of CA certificates in the extended BEGIN/END TRUSTED CERTIFICATE file format, which includes trust (and/or distrust) flags specific to certificate usage.
|
||||||
|
This file is a symbolic link that refers to the consolidated output created by the update-ca-trust command.
|
||||||
|
|
||||||
|
/etc/pki/java/cacerts::
|
||||||
|
Classic filename, file contains a list of CA certificates trusted for TLS server authentication usage, in the Java keystore file format, without distrust information.
|
||||||
|
This file is a symbolic link that refers to the consolidated output created by the update-ca-trust command.
|
||||||
|
|
||||||
|
/usr/share/pki/ca-trust-source::
|
||||||
|
Contains multiple, low priority source configuration files as explained in section <<sourceconf,SOURCE CONFIGURATION>>. Please pay attention to the specific meanings of the respective subdirectories.
|
||||||
|
|
||||||
|
/etc/pki/ca-trust/source::
|
||||||
|
Contains multiple, high priority source configuration files as explained in section <<sourceconf,SOURCE CONFIGURATION>>. Please pay attention to the specific meanings of the respective subdirectories.
|
||||||
|
|
||||||
|
/etc/pki/ca-trust/extracted::
|
||||||
|
Contains consolidated and automatically generated configuration files for consumption by applications,
|
||||||
|
which are created using the 'update-ca-trust extract' command. Don't edit files in this directory, because they will be overwritten.
|
||||||
|
See section <<extractconf,EXTRACTED CONFIGURATION>> for additional details.
|
||||||
|
|
||||||
|
AUTHOR
|
||||||
|
------
|
||||||
|
Written by Kai Engert and Stef Walter.
|
||||||
732
SPECS/ca-certificates.spec
Normal file
732
SPECS/ca-certificates.spec
Normal file
@ -0,0 +1,732 @@
|
|||||||
|
%define pkidir %{_sysconfdir}/pki
|
||||||
|
%define catrustdir %{_sysconfdir}/pki/ca-trust
|
||||||
|
%define classic_tls_bundle ca-bundle.crt
|
||||||
|
%define openssl_format_trust_bundle ca-bundle.trust.crt
|
||||||
|
%define p11_format_bundle ca-bundle.trust.p11-kit
|
||||||
|
%define legacy_default_bundle ca-bundle.legacy.default.crt
|
||||||
|
%define legacy_disable_bundle ca-bundle.legacy.disable.crt
|
||||||
|
%define java_bundle java/cacerts
|
||||||
|
|
||||||
|
Summary: The Mozilla CA root certificate bundle
|
||||||
|
Name: ca-certificates
|
||||||
|
|
||||||
|
# For the package version number, we use: year.{upstream version}
|
||||||
|
#
|
||||||
|
# The {upstream version} can be found as symbol
|
||||||
|
# NSS_BUILTINS_LIBRARY_VERSION in file nss/lib/ckfw/builtins/nssckbi.h
|
||||||
|
# which corresponds to the data in file nss/lib/ckfw/builtins/certdata.txt.
|
||||||
|
#
|
||||||
|
# The files should be taken from a released version of NSS, as published
|
||||||
|
# at https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/
|
||||||
|
#
|
||||||
|
# The versions that are used by the latest released version of
|
||||||
|
# Mozilla Firefox should be available from:
|
||||||
|
# https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/nssckbi.h
|
||||||
|
# https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
|
||||||
|
#
|
||||||
|
# The most recent development versions of the files can be found at
|
||||||
|
# http://hg.mozilla.org/projects/nss/raw-file/default/lib/ckfw/builtins/nssckbi.h
|
||||||
|
# http://hg.mozilla.org/projects/nss/raw-file/default/lib/ckfw/builtins/certdata.txt
|
||||||
|
# (but these files might have not yet been released).
|
||||||
|
#
|
||||||
|
# (until 2012.87 the version was based on the cvs revision ID of certdata.txt,
|
||||||
|
# but in 2013 the NSS projected was migrated to HG. Old version 2012.87 is
|
||||||
|
# equivalent to new version 2012.1.93, which would break the requirement
|
||||||
|
# to have increasing version numbers. However, the new scheme will work,
|
||||||
|
# because all future versions will start with 2013 or larger.)
|
||||||
|
|
||||||
|
Version: 2018.2.24
|
||||||
|
# for Rawhide, please always use release >= 2
|
||||||
|
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
|
||||||
|
Release: 6%{?dist}
|
||||||
|
License: Public Domain
|
||||||
|
|
||||||
|
Group: System Environment/Base
|
||||||
|
URL: https://fedoraproject.org/wiki/CA-Certificates
|
||||||
|
|
||||||
|
#Please always update both certdata.txt and nssckbi.h
|
||||||
|
Source0: certdata.txt
|
||||||
|
Source1: nssckbi.h
|
||||||
|
Source2: update-ca-trust
|
||||||
|
Source3: trust-fixes
|
||||||
|
Source4: certdata2pem.py
|
||||||
|
Source5: ca-legacy.conf
|
||||||
|
Source6: ca-legacy
|
||||||
|
Source9: ca-legacy.8.txt
|
||||||
|
Source10: update-ca-trust.8.txt
|
||||||
|
Source11: README.usr
|
||||||
|
Source12: README.etc
|
||||||
|
Source13: README.extr
|
||||||
|
Source14: README.java
|
||||||
|
Source15: README.openssl
|
||||||
|
Source16: README.pem
|
||||||
|
Source17: README.edk2
|
||||||
|
Source18: README.src
|
||||||
|
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
Requires(post): bash
|
||||||
|
Requires(post): grep
|
||||||
|
Requires(post): sed
|
||||||
|
Requires(post): coreutils
|
||||||
|
Requires: bash
|
||||||
|
Requires: grep
|
||||||
|
Requires: sed
|
||||||
|
Requires(post): p11-kit >= 0.23.12
|
||||||
|
Requires(post): p11-kit-trust >= 0.23.12
|
||||||
|
Requires: p11-kit >= 0.23.12
|
||||||
|
Requires: p11-kit-trust >= 0.23.12
|
||||||
|
|
||||||
|
BuildRequires: perl-interpreter
|
||||||
|
BuildRequires: python3
|
||||||
|
BuildRequires: openssl
|
||||||
|
BuildRequires: asciidoc
|
||||||
|
BuildRequires: libxslt
|
||||||
|
|
||||||
|
%description
|
||||||
|
This package contains the set of CA certificates chosen by the
|
||||||
|
Mozilla Foundation for use with the Internet PKI.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
rm -rf %{name}
|
||||||
|
mkdir %{name}
|
||||||
|
mkdir %{name}/certs
|
||||||
|
mkdir %{name}/certs/legacy-default
|
||||||
|
mkdir %{name}/certs/legacy-disable
|
||||||
|
mkdir %{name}/java
|
||||||
|
|
||||||
|
%build
|
||||||
|
pushd %{name}/certs
|
||||||
|
pwd
|
||||||
|
cp %{SOURCE0} .
|
||||||
|
%{__python3} %{SOURCE4} >c2p.log 2>c2p.err
|
||||||
|
popd
|
||||||
|
pushd %{name}
|
||||||
|
(
|
||||||
|
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 and trust/distrust attributes use the file format accepted
|
||||||
|
# by the p11-kit-trust module.
|
||||||
|
#
|
||||||
|
# Source: nss/lib/ckfw/builtins/certdata.txt
|
||||||
|
# Source: nss/lib/ckfw/builtins/nssckbi.h
|
||||||
|
#
|
||||||
|
# Generated from:
|
||||||
|
EOF
|
||||||
|
cat %{SOURCE1} |grep -w NSS_BUILTINS_LIBRARY_VERSION | awk '{print "# " $2 " " $3}';
|
||||||
|
echo '#';
|
||||||
|
) > %{p11_format_bundle}
|
||||||
|
|
||||||
|
touch %{legacy_default_bundle}
|
||||||
|
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" >> %{legacy_default_bundle}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
touch %{legacy_disable_bundle}
|
||||||
|
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" >> %{legacy_disable_bundle}
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
P11FILES=`find certs -name \*.tmp-p11-kit | wc -l`
|
||||||
|
if [ $P11FILES -ne 0 ]; then
|
||||||
|
for p in certs/*.tmp-p11-kit; do
|
||||||
|
cat "$p" >> %{p11_format_bundle}
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
# Append our trust fixes
|
||||||
|
cat %{SOURCE3} >> %{p11_format_bundle}
|
||||||
|
popd
|
||||||
|
|
||||||
|
#manpage
|
||||||
|
cp %{SOURCE10} %{name}/update-ca-trust.8.txt
|
||||||
|
asciidoc.py -v -d manpage -b docbook %{name}/update-ca-trust.8.txt
|
||||||
|
xsltproc --nonet -o %{name}/update-ca-trust.8 /usr/share/asciidoc/docbook-xsl/manpage.xsl %{name}/update-ca-trust.8.xml
|
||||||
|
|
||||||
|
cp %{SOURCE9} %{name}/ca-legacy.8.txt
|
||||||
|
asciidoc.py -v -d manpage -b docbook %{name}/ca-legacy.8.txt
|
||||||
|
xsltproc --nonet -o %{name}/ca-legacy.8 /usr/share/asciidoc/docbook-xsl/manpage.xsl %{name}/ca-legacy.8.xml
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{pkidir}/tls/certs
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{pkidir}/java
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/ssl
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{catrustdir}/source
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{catrustdir}/source/anchors
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{catrustdir}/source/blacklist
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{catrustdir}/extracted
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{catrustdir}/extracted/pem
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{catrustdir}/extracted/openssl
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{catrustdir}/extracted/java
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{catrustdir}/extracted/edk2
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-source
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-source/anchors
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-source/blacklist
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-legacy
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{_bindir}
|
||||||
|
mkdir -p -m 755 $RPM_BUILD_ROOT%{_mandir}/man8
|
||||||
|
|
||||||
|
install -p -m 644 %{name}/update-ca-trust.8 $RPM_BUILD_ROOT%{_mandir}/man8
|
||||||
|
install -p -m 644 %{name}/ca-legacy.8 $RPM_BUILD_ROOT%{_mandir}/man8
|
||||||
|
install -p -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-source/README
|
||||||
|
install -p -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{catrustdir}/README
|
||||||
|
install -p -m 644 %{SOURCE13} $RPM_BUILD_ROOT%{catrustdir}/extracted/README
|
||||||
|
install -p -m 644 %{SOURCE14} $RPM_BUILD_ROOT%{catrustdir}/extracted/java/README
|
||||||
|
install -p -m 644 %{SOURCE15} $RPM_BUILD_ROOT%{catrustdir}/extracted/openssl/README
|
||||||
|
install -p -m 644 %{SOURCE16} $RPM_BUILD_ROOT%{catrustdir}/extracted/pem/README
|
||||||
|
install -p -m 644 %{SOURCE17} $RPM_BUILD_ROOT%{catrustdir}/extracted/edk2/README
|
||||||
|
install -p -m 644 %{SOURCE18} $RPM_BUILD_ROOT%{catrustdir}/source/README
|
||||||
|
|
||||||
|
install -p -m 644 %{name}/%{p11_format_bundle} $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-source/%{p11_format_bundle}
|
||||||
|
|
||||||
|
install -p -m 644 %{name}/%{legacy_default_bundle} $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-legacy/%{legacy_default_bundle}
|
||||||
|
install -p -m 644 %{name}/%{legacy_disable_bundle} $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-legacy/%{legacy_disable_bundle}
|
||||||
|
|
||||||
|
install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{catrustdir}/ca-legacy.conf
|
||||||
|
|
||||||
|
touch -r %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-source/%{p11_format_bundle}
|
||||||
|
|
||||||
|
touch -r %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-legacy/%{legacy_default_bundle}
|
||||||
|
touch -r %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/pki/ca-trust-legacy/%{legacy_disable_bundle}
|
||||||
|
|
||||||
|
# TODO: consider to dynamically create the update-ca-trust script from within
|
||||||
|
# this .spec file, in order to have the output file+directory names at once place only.
|
||||||
|
install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-ca-trust
|
||||||
|
|
||||||
|
install -p -m 755 %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/ca-legacy
|
||||||
|
|
||||||
|
# touch ghosted files that will be extracted dynamically
|
||||||
|
# Set chmod 444 to use identical permission
|
||||||
|
touch $RPM_BUILD_ROOT%{catrustdir}/extracted/pem/tls-ca-bundle.pem
|
||||||
|
chmod 444 $RPM_BUILD_ROOT%{catrustdir}/extracted/pem/tls-ca-bundle.pem
|
||||||
|
touch $RPM_BUILD_ROOT%{catrustdir}/extracted/pem/email-ca-bundle.pem
|
||||||
|
chmod 444 $RPM_BUILD_ROOT%{catrustdir}/extracted/pem/email-ca-bundle.pem
|
||||||
|
touch $RPM_BUILD_ROOT%{catrustdir}/extracted/pem/objsign-ca-bundle.pem
|
||||||
|
chmod 444 $RPM_BUILD_ROOT%{catrustdir}/extracted/pem/objsign-ca-bundle.pem
|
||||||
|
touch $RPM_BUILD_ROOT%{catrustdir}/extracted/openssl/%{openssl_format_trust_bundle}
|
||||||
|
chmod 444 $RPM_BUILD_ROOT%{catrustdir}/extracted/openssl/%{openssl_format_trust_bundle}
|
||||||
|
touch $RPM_BUILD_ROOT%{catrustdir}/extracted/%{java_bundle}
|
||||||
|
chmod 444 $RPM_BUILD_ROOT%{catrustdir}/extracted/%{java_bundle}
|
||||||
|
touch $RPM_BUILD_ROOT%{catrustdir}/extracted/edk2/cacerts.bin
|
||||||
|
chmod 444 $RPM_BUILD_ROOT%{catrustdir}/extracted/edk2/cacerts.bin
|
||||||
|
|
||||||
|
# /etc/ssl/certs symlink for 3rd-party tools
|
||||||
|
ln -s ../pki/tls/certs \
|
||||||
|
$RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs
|
||||||
|
# legacy filenames
|
||||||
|
ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \
|
||||||
|
$RPM_BUILD_ROOT%{pkidir}/tls/cert.pem
|
||||||
|
ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \
|
||||||
|
$RPM_BUILD_ROOT%{pkidir}/tls/certs/%{classic_tls_bundle}
|
||||||
|
ln -s %{catrustdir}/extracted/openssl/%{openssl_format_trust_bundle} \
|
||||||
|
$RPM_BUILD_ROOT%{pkidir}/tls/certs/%{openssl_format_trust_bundle}
|
||||||
|
ln -s %{catrustdir}/extracted/%{java_bundle} \
|
||||||
|
$RPM_BUILD_ROOT%{pkidir}/%{java_bundle}
|
||||||
|
|
||||||
|
|
||||||
|
%pre
|
||||||
|
if [ $1 -gt 1 ] ; then
|
||||||
|
# Upgrade or Downgrade.
|
||||||
|
# If the classic filename is a regular file, then we are upgrading
|
||||||
|
# from an old package and we will move it to an .rpmsave backup file.
|
||||||
|
# If the filename is a symbolic link, then we are good already.
|
||||||
|
# If the system will later be downgraded to an old package with regular
|
||||||
|
# files, and afterwards updated again to a newer package with symlinks,
|
||||||
|
# and the old .rpmsave backup file didn't get cleaned up,
|
||||||
|
# then we don't backup again. We keep the older backup file.
|
||||||
|
# In other words, if an .rpmsave file already exists, we don't overwrite it.
|
||||||
|
#
|
||||||
|
if ! test -e %{pkidir}/%{java_bundle}.rpmsave; then
|
||||||
|
# no backup yet
|
||||||
|
if test -e %{pkidir}/%{java_bundle}; then
|
||||||
|
# a file exists
|
||||||
|
if ! test -L %{pkidir}/%{java_bundle}; then
|
||||||
|
# it's an old regular file, not a link
|
||||||
|
mv -f %{pkidir}/%{java_bundle} %{pkidir}/%{java_bundle}.rpmsave
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! test -e %{pkidir}/tls/certs/%{classic_tls_bundle}.rpmsave; then
|
||||||
|
# no backup yet
|
||||||
|
if test -e %{pkidir}/tls/certs/%{classic_tls_bundle}; then
|
||||||
|
# a file exists
|
||||||
|
if ! test -L %{pkidir}/tls/certs/%{classic_tls_bundle}; then
|
||||||
|
# it's an old regular file, not a link
|
||||||
|
mv -f %{pkidir}/tls/certs/%{classic_tls_bundle} %{pkidir}/tls/certs/%{classic_tls_bundle}.rpmsave
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! test -e %{pkidir}/tls/certs/%{openssl_format_trust_bundle}.rpmsave; then
|
||||||
|
# no backup yet
|
||||||
|
if test -e %{pkidir}/tls/certs/%{openssl_format_trust_bundle}; then
|
||||||
|
# a file exists
|
||||||
|
if ! test -L %{pkidir}/tls/certs/%{openssl_format_trust_bundle}; then
|
||||||
|
# it's an old regular file, not a link
|
||||||
|
mv -f %{pkidir}/tls/certs/%{openssl_format_trust_bundle} %{pkidir}/tls/certs/%{openssl_format_trust_bundle}.rpmsave
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
%post
|
||||||
|
#if [ $1 -gt 1 ] ; then
|
||||||
|
# # when upgrading or downgrading
|
||||||
|
#fi
|
||||||
|
%{_bindir}/ca-legacy install
|
||||||
|
%{_bindir}/update-ca-trust
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
|
||||||
|
%dir %{_sysconfdir}/ssl
|
||||||
|
%dir %{pkidir}/tls
|
||||||
|
%dir %{pkidir}/tls/certs
|
||||||
|
%dir %{pkidir}/java
|
||||||
|
%dir %{catrustdir}
|
||||||
|
%dir %{catrustdir}/source
|
||||||
|
%dir %{catrustdir}/source/anchors
|
||||||
|
%dir %{catrustdir}/source/blacklist
|
||||||
|
%dir %{catrustdir}/extracted
|
||||||
|
%dir %{catrustdir}/extracted/pem
|
||||||
|
%dir %{catrustdir}/extracted/openssl
|
||||||
|
%dir %{catrustdir}/extracted/java
|
||||||
|
%dir %{_datadir}/pki
|
||||||
|
%dir %{_datadir}/pki/ca-trust-source
|
||||||
|
%dir %{_datadir}/pki/ca-trust-source/anchors
|
||||||
|
%dir %{_datadir}/pki/ca-trust-source/blacklist
|
||||||
|
%dir %{_datadir}/pki/ca-trust-legacy
|
||||||
|
|
||||||
|
%config(noreplace) %{catrustdir}/ca-legacy.conf
|
||||||
|
|
||||||
|
%{_mandir}/man8/update-ca-trust.8.gz
|
||||||
|
%{_mandir}/man8/ca-legacy.8.gz
|
||||||
|
%{_datadir}/pki/ca-trust-source/README
|
||||||
|
%{catrustdir}/README
|
||||||
|
%{catrustdir}/extracted/README
|
||||||
|
%{catrustdir}/extracted/java/README
|
||||||
|
%{catrustdir}/extracted/openssl/README
|
||||||
|
%{catrustdir}/extracted/pem/README
|
||||||
|
%{catrustdir}/extracted/edk2/README
|
||||||
|
%{catrustdir}/source/README
|
||||||
|
|
||||||
|
# symlinks for old locations
|
||||||
|
%{pkidir}/tls/cert.pem
|
||||||
|
%{pkidir}/tls/certs/%{classic_tls_bundle}
|
||||||
|
%{pkidir}/tls/certs/%{openssl_format_trust_bundle}
|
||||||
|
%{pkidir}/%{java_bundle}
|
||||||
|
# symlink directory
|
||||||
|
%{_sysconfdir}/ssl/certs
|
||||||
|
|
||||||
|
# master bundle file with trust
|
||||||
|
%{_datadir}/pki/ca-trust-source/%{p11_format_bundle}
|
||||||
|
|
||||||
|
%{_datadir}/pki/ca-trust-legacy/%{legacy_default_bundle}
|
||||||
|
%{_datadir}/pki/ca-trust-legacy/%{legacy_disable_bundle}
|
||||||
|
# update/extract tool
|
||||||
|
%{_bindir}/update-ca-trust
|
||||||
|
%{_bindir}/ca-legacy
|
||||||
|
%ghost %{catrustdir}/source/ca-bundle.legacy.crt
|
||||||
|
# files extracted files
|
||||||
|
%ghost %{catrustdir}/extracted/pem/tls-ca-bundle.pem
|
||||||
|
%ghost %{catrustdir}/extracted/pem/email-ca-bundle.pem
|
||||||
|
%ghost %{catrustdir}/extracted/pem/objsign-ca-bundle.pem
|
||||||
|
%ghost %{catrustdir}/extracted/openssl/%{openssl_format_trust_bundle}
|
||||||
|
%ghost %{catrustdir}/extracted/%{java_bundle}
|
||||||
|
%ghost %{catrustdir}/extracted/edk2/cacerts.bin
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Mon Aug 13 2018 Tomáš Mráz <tmraz@redhat.com> - 2018.2.24-6
|
||||||
|
- Use __python3 macro when invoking Python
|
||||||
|
|
||||||
|
* Thu Jun 28 2018 Kai Engert <kaie@redhat.com> - 2018.2.24-5
|
||||||
|
- Ported scripts to python3
|
||||||
|
|
||||||
|
* Mon Jun 11 2018 Daiki Ueno <dueno@redhat.com> - 2018.2.24-4
|
||||||
|
- Extract certificate bundle in EDK2 format, suggested by Laszlo Ersek
|
||||||
|
|
||||||
|
* Mon Jun 04 2018 Kai Engert <kaie@redhat.com> - 2018.2.24-3
|
||||||
|
- Adjust ghost file permissions, rhbz#1564432
|
||||||
|
|
||||||
|
* Fri May 18 2018 Kai Engert <kaie@redhat.com> - 2018.2.24-2
|
||||||
|
- Update to CKBI 2.24 from NSS 3.37
|
||||||
|
|
||||||
|
* Wed Mar 14 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2018.2.22-4
|
||||||
|
- Update Python 2 dependency declarations to new packaging standards
|
||||||
|
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
||||||
|
|
||||||
|
* Fri Feb 23 2018 Patrick Uiterwijk <puiterwijk@redhat.com> - 2018.2.22-3
|
||||||
|
- Add post dep on coreutils for ln(1)
|
||||||
|
|
||||||
|
* Tue Feb 06 2018 Kai Engert <kaie@redhat.com> - 2018.2.22-2
|
||||||
|
- Update to CKBI 2.22 from NSS 3.35
|
||||||
|
|
||||||
|
* Mon Jan 22 2018 Kai Engert <kaie@redhat.com> - 2017.2.20-6
|
||||||
|
- Depend on bash, grep, sed. Required for ca-legacy script execution.
|
||||||
|
- p11-kit is already required at %%post execution time. (rhbz#1537127)
|
||||||
|
|
||||||
|
* Fri Jan 19 2018 Kai Engert <kaie@redhat.com> - 2017.2.20-5
|
||||||
|
- Use the force, script! (Which sln did by default).
|
||||||
|
|
||||||
|
* Fri Jan 19 2018 Kai Engert <kaie@redhat.com> - 2017.2.20-4
|
||||||
|
- stop using sln in ca-legacy script.
|
||||||
|
|
||||||
|
* Fri Jan 19 2018 Kai Engert <kaie@redhat.com> - 2017.2.20-3
|
||||||
|
- Use ln -s, because sln was removed from glibc. rhbz#1536349
|
||||||
|
|
||||||
|
* Mon Nov 27 2017 Kai Engert <kaie@redhat.com> - 2017.2.20-2
|
||||||
|
- Update to CKBI 2.20 from NSS 3.34.1
|
||||||
|
|
||||||
|
* Tue Aug 15 2017 Kai Engert <kaie@redhat.com> - 2017.2.16-4
|
||||||
|
- Set P11_KIT_NO_USER_CONFIG=1 to prevent p11-kit from reading user
|
||||||
|
configuration files (rhbz#1478172).
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2017.2.16-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 19 2017 Kai Engert <kaie@redhat.com> - 2017.2.16-2
|
||||||
|
- Update to (yet unreleased) CKBI 2.16 which is planned for NSS 3.32.
|
||||||
|
Mozilla removed all trust bits for code signing.
|
||||||
|
|
||||||
|
* Wed Apr 26 2017 Kai Engert <kaie@redhat.com> - 2017.2.14-2
|
||||||
|
- Update to CKBI 2.14 from NSS 3.30.2
|
||||||
|
|
||||||
|
* Thu Feb 23 2017 Kai Engert <kaie@redhat.com> - 2017.2.11-5
|
||||||
|
- For CAs trusted by Mozilla, set attribute nss-mozilla-ca-policy: true
|
||||||
|
- Set attribute modifiable: false
|
||||||
|
- Require p11-kit 0.23.4
|
||||||
|
|
||||||
|
* Mon Feb 13 2017 Kai Engert <kaie@redhat.com> - 2017.2.11-4
|
||||||
|
- Changed the packaged bundle to use the flexible p11-kit-object-v1 file format,
|
||||||
|
as a preparation to fix bugs in the interaction between p11-kit-trust and
|
||||||
|
Mozilla applications, such as Firefox, Thunderbird etc.
|
||||||
|
- Changed update-ca-trust to add comments to extracted PEM format files.
|
||||||
|
- Added an utility to help with comparing output of the trust dump command.
|
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2017.2.11-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 11 2017 Kai Engert <kaie@redhat.com> - 2017.2.11-2
|
||||||
|
- Update to CKBI 2.11 from NSS 3.28.1
|
||||||
|
|
||||||
|
* Thu Sep 29 2016 Kai Engert <kaie@redhat.com> - 2016.2.10-2
|
||||||
|
- Update to CKBI 2.10 from NSS 3.27
|
||||||
|
|
||||||
|
* Tue Aug 16 2016 Kai Engert <kaie@redhat.com> - 2016.2.9-3
|
||||||
|
- Revert to the unmodified upstream CA list, changing the legacy trust
|
||||||
|
to an empty list. Keeping the ca-legacy tool and existing config,
|
||||||
|
however, the configuration has no effect after this change.
|
||||||
|
|
||||||
|
* Tue Aug 16 2016 Kai Engert <kaie@redhat.com> - 2016.2.9-2
|
||||||
|
- Update to CKBI 2.9 from NSS 3.26 with legacy modifications
|
||||||
|
|
||||||
|
* Fri Jul 15 2016 Kai Engert <kaie@redhat.com> - 2016.2.8-2
|
||||||
|
- Update to CKBI 2.8 from NSS 3.25 with legacy modifications
|
||||||
|
|
||||||
|
* Tue May 10 2016 Kai Engert <kaie@redhat.com> - 2016.2.7-5
|
||||||
|
- Only create backup files if there is an original file (bug 999017).
|
||||||
|
|
||||||
|
* Tue May 10 2016 Kai Engert <kaie@redhat.com> - 2016.2.7-4
|
||||||
|
- Use sln, not ln, to avoid the dependency on coreutils.
|
||||||
|
|
||||||
|
* Mon Apr 25 2016 Kai Engert <kaie@redhat.com> - 2016.2.7-3
|
||||||
|
- Fix typos in a manual page and in a README file.
|
||||||
|
|
||||||
|
* Wed Mar 16 2016 Kai Engert <kaie@redhat.com> - 2016.2.7-2
|
||||||
|
- Update to CKBI 2.7 from NSS 3.23 with legacy modifications
|
||||||
|
|
||||||
|
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2015.2.6-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Nov 23 2015 Kai Engert <kaie@redhat.com> - 2015.2.6-2
|
||||||
|
- Update to CKBI 2.6 from NSS 3.21 with legacy modifications
|
||||||
|
|
||||||
|
* Thu Aug 13 2015 Kai Engert <kaie@redhat.com> - 2015.2.5-2
|
||||||
|
- Update to CKBI 2.5 from NSS 3.19.3 with legacy modifications
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2015.2.4-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue May 05 2015 Kai Engert <kaie@redhat.com> - 2015.2.4-2
|
||||||
|
- Update to CKBI 2.4 from NSS 3.18.1 with legacy modifications
|
||||||
|
|
||||||
|
* Tue May 05 2015 Kai Engert <kaie@redhat.com> - 2015.2.3-4
|
||||||
|
- Fixed a typo in the ca-legacy manual page.
|
||||||
|
|
||||||
|
* Tue Mar 31 2015 Kai Engert <kaie@redhat.com> - 2015.2.3-3
|
||||||
|
- Don't use "enable" as a value for the legacy configuration, instead
|
||||||
|
of the value "default", to make it clear that this preference isn't
|
||||||
|
a promise to keep certificates enabled, but rather that we only
|
||||||
|
keep them enabled as long as it's considered necessary.
|
||||||
|
- Changed the configuration file, the ca-legacy utility and filenames
|
||||||
|
to use the term "default" (instead of the term "enable").
|
||||||
|
- Added a manual page for the ca-legacy utility.
|
||||||
|
- Fixed the ca-legacy utility to handle absence of the configuration
|
||||||
|
setting and treat absence as the default setting.
|
||||||
|
|
||||||
|
* Fri Mar 20 2015 Kai Engert <kaie@redhat.com> - 2015.2.3-2
|
||||||
|
- Update to CKBI 2.3 from NSS 3.18 with legacy modifications
|
||||||
|
- Fixed a mistake in the legacy handling of the upstream 2.2 release:
|
||||||
|
Removed two AOL certificates from the legacy group, because
|
||||||
|
upstream didn't remove them as part of phasing out 1024-bit
|
||||||
|
certificates, which means it isn't necessary to keep them.
|
||||||
|
- Fixed a mistake in the legacy handling of the upstream 2.1 release:
|
||||||
|
Moved two NetLock certificates into the legacy group.
|
||||||
|
|
||||||
|
* Tue Dec 16 2014 Kai Engert <kaie@redhat.com> - 2014.2.2-2
|
||||||
|
- Update to CKBI 2.2 from NSS 3.17.3 with legacy modifications
|
||||||
|
- Update project URL
|
||||||
|
- Cleanup
|
||||||
|
|
||||||
|
* Sat Nov 15 2014 Peter Lemenkov <lemenkov@gmail.com> - 2014.2.1-7
|
||||||
|
- Restore Requires: coreutils
|
||||||
|
|
||||||
|
* Fri Nov 14 2014 Peter Lemenkov <lemenkov@gmail.com> - 2014.2.1-6
|
||||||
|
- A proper fix for rhbz#1158343
|
||||||
|
|
||||||
|
* Wed Oct 29 2014 Kai Engert <kaie@redhat.com> - 2014.2.1-5
|
||||||
|
- add Requires: coreutils (rhbz#1158343)
|
||||||
|
|
||||||
|
* Tue Oct 28 2014 Kai Engert <kaie@redhat.com> - 2014.2.1-4
|
||||||
|
- Introduce the ca-legacy utility and a ca-legacy.conf configuration file.
|
||||||
|
By default, legacy roots required for OpenSSL/GnuTLS compatibility
|
||||||
|
are kept enabled. Using the ca-legacy utility, the legacy roots can be
|
||||||
|
disabled. If disabled, the system will use the trust set as provided
|
||||||
|
by the upstream Mozilla CA list. (See also: rhbz#1158197)
|
||||||
|
|
||||||
|
* Sun Sep 21 2014 Kai Engert <kaie@redhat.com> - 2014.2.1-3
|
||||||
|
- Temporarily re-enable several legacy root CA certificates because of
|
||||||
|
compatibility issues with software based on OpenSSL/GnuTLS,
|
||||||
|
see rhbz#1144808
|
||||||
|
|
||||||
|
* Thu Aug 14 2014 Kai Engert <kaie@redhat.com> - 2014.2.1-2
|
||||||
|
- Update to CKBI 2.1 from NSS 3.16.4
|
||||||
|
- Fix rhbz#1130226
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2013.1.97-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Mar 19 2014 Kai Engert <kaie@redhat.com> - 2013.1.97-2
|
||||||
|
- Update to CKBI 1.97 from NSS 3.16
|
||||||
|
|
||||||
|
* Mon Feb 10 2014 Kai Engert <kaie@redhat.com> - 2013.1.96-3
|
||||||
|
- Remove openjdk build dependency
|
||||||
|
|
||||||
|
* Sat Jan 25 2014 Ville Skyttä <ville.skytta@iki.fi> - 2013.1.96-2
|
||||||
|
- Own the %%{_datadir}/pki dir.
|
||||||
|
|
||||||
|
* Thu Jan 09 2014 Kai Engert <kaie@redhat.com> - 2013.1.96-1
|
||||||
|
- Update to CKBI 1.96 from NSS 3.15.4
|
||||||
|
|
||||||
|
* Tue Dec 17 2013 Kai Engert <kaie@redhat.com> - 2013.1.95-1
|
||||||
|
- Update to CKBI 1.95 from NSS 3.15.3.1
|
||||||
|
|
||||||
|
* Fri Sep 06 2013 Kai Engert <kaie@redhat.com> - 2013.1.94-18
|
||||||
|
- Update the Entrust root stapled extension for compatibility with
|
||||||
|
p11-kit version 0.19.2, patch by Stef Walter, rhbz#988745
|
||||||
|
|
||||||
|
* Tue Sep 03 2013 Kai Engert <kaie@redhat.com> - 2013.1.94-17
|
||||||
|
- merge manual improvement from f19
|
||||||
|
|
||||||
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2013.1.94-16
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 09 2013 Kai Engert <kaie@redhat.com> - 2013.1.94-15
|
||||||
|
- clarification updates to manual page
|
||||||
|
|
||||||
|
* Mon Jul 08 2013 Kai Engert <kaie@redhat.com> - 2013.1.94-14
|
||||||
|
- added a manual page and related build requirements
|
||||||
|
- simplify the README files now that we have a manual page
|
||||||
|
- set a certificate alias in trusted bundle (thanks to Ludwig Nussel)
|
||||||
|
|
||||||
|
* Mon May 27 2013 Kai Engert <kaie@redhat.com> - 2013.1.94-13
|
||||||
|
- use correct command in README files, rhbz#961809
|
||||||
|
|
||||||
|
* Mon May 27 2013 Kai Engert <kaie@redhat.com> - 2013.1.94-12
|
||||||
|
- update to version 1.94 provided by NSS 3.15 (beta)
|
||||||
|
|
||||||
|
* Mon Apr 22 2013 Kai Engert <kaie@redhat.com> - 2012.87-12
|
||||||
|
- Use both label and serial to identify cert during conversion, rhbz#927601
|
||||||
|
- Add myself as contributor to certdata2.pem.py and remove use of rcs/ident.
|
||||||
|
(thanks to Michael Shuler for suggesting to do so)
|
||||||
|
- Update source URLs and comments, add source file for version information.
|
||||||
|
|
||||||
|
* Tue Mar 19 2013 Kai Engert <kaie@redhat.com> - 2012.87-11
|
||||||
|
- adjust to changed and new functionality provided by p11-kit 0.17.3
|
||||||
|
- updated READMEs to describe the new directory-specific treatment of files
|
||||||
|
- ship a new file that contains certificates with neutral trust
|
||||||
|
- ship a new file that contains distrust objects, and also staple a
|
||||||
|
basic constraint extension to one legacy root contained in the
|
||||||
|
Mozilla CA list
|
||||||
|
- adjust the build script to dynamically produce most of above files
|
||||||
|
- add and own the anchors and blacklist subdirectories
|
||||||
|
- file generate-cacerts.pl is no longer required
|
||||||
|
|
||||||
|
* Fri Mar 08 2013 Kai Engert <kaie@redhat.com> - 2012.87-9
|
||||||
|
- Major rework for the Fedora SharedSystemCertificates feature.
|
||||||
|
- Only ship a PEM bundle file using the BEGIN TRUSTED CERTIFICATE file format.
|
||||||
|
- Require the p11-kit package that contains tools to automatically create
|
||||||
|
other file format bundles.
|
||||||
|
- Convert old file locations to symbolic links that point to dynamically
|
||||||
|
generated files.
|
||||||
|
- Old files, which might have been locally modified, will be saved in backup
|
||||||
|
files with .rpmsave extension.
|
||||||
|
- Added a update-ca-certificates script which can be used to regenerate
|
||||||
|
the merged trusted output.
|
||||||
|
- Refer to the various README files that have been added for more detailed
|
||||||
|
explanation of the new system.
|
||||||
|
- No longer require rsc for building.
|
||||||
|
- Add explanation for the future version numbering scheme,
|
||||||
|
because the old numbering scheme was based on upstream using cvs,
|
||||||
|
which is no longer true, and therefore can no longer be used.
|
||||||
|
- Includes changes from rhbz#873369.
|
||||||
|
|
||||||
|
* Thu Mar 07 2013 Kai Engert <kaie@redhat.com> - 2012.87-2.fc19.1
|
||||||
|
- Ship trust bundle file in /usr/share/pki/ca-trust-source/, temporarily in addition.
|
||||||
|
This location will soon become the only place containing this file.
|
||||||
|
|
||||||
|
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2012.87-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 04 2013 Paul Wouters <pwouters@redhat.com> - 2012.87-1
|
||||||
|
- Updated to r1.87 to blacklist mis-issued turktrust CA certs
|
||||||
|
|
||||||
|
* Wed Oct 24 2012 Paul Wouters <pwouters@redhat.com> - 2012.86-2
|
||||||
|
- Updated blacklist with 20 entries (Diginotar, Trustwave, Comodo(?)
|
||||||
|
- Fix to certdata2pem.py to also check for CKT_NSS_NOT_TRUSTED
|
||||||
|
|
||||||
|
* Tue Oct 23 2012 Paul Wouters <pwouters@redhat.com> - 2012.86-1
|
||||||
|
- update to r1.86
|
||||||
|
|
||||||
|
* Mon Jul 23 2012 Joe Orton <jorton@redhat.com> - 2012.85-2
|
||||||
|
- add openssl to BuildRequires
|
||||||
|
|
||||||
|
* Mon Jul 23 2012 Joe Orton <jorton@redhat.com> - 2012.85-1
|
||||||
|
- update to r1.85
|
||||||
|
|
||||||
|
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2012.81-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Feb 13 2012 Joe Orton <jorton@redhat.com> - 2012.81-1
|
||||||
|
- update to r1.81
|
||||||
|
|
||||||
|
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2011.80-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 9 2011 Joe Orton <jorton@redhat.com> - 2011.80-1
|
||||||
|
- update to r1.80
|
||||||
|
- fix handling of certs with dublicate Subject names (#733032)
|
||||||
|
|
||||||
|
* Thu Sep 1 2011 Joe Orton <jorton@redhat.com> - 2011.78-1
|
||||||
|
- update to r1.78, removing trust from DigiNotar root (#734679)
|
||||||
|
|
||||||
|
* Wed Aug 3 2011 Joe Orton <jorton@redhat.com> - 2011.75-1
|
||||||
|
- update to r1.75
|
||||||
|
|
||||||
|
* Wed Apr 20 2011 Joe Orton <jorton@redhat.com> - 2011.74-1
|
||||||
|
- update to r1.74
|
||||||
|
|
||||||
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2011.70-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jan 12 2011 Joe Orton <jorton@redhat.com> - 2011.70-1
|
||||||
|
- update to r1.70
|
||||||
|
|
||||||
|
* Tue Nov 9 2010 Joe Orton <jorton@redhat.com> - 2010.65-3
|
||||||
|
- update to r1.65
|
||||||
|
|
||||||
|
* Wed Apr 7 2010 Joe Orton <jorton@redhat.com> - 2010.63-3
|
||||||
|
- package /etc/ssl/certs symlink for third-party apps (#572725)
|
||||||
|
|
||||||
|
* Wed Apr 7 2010 Joe Orton <jorton@redhat.com> - 2010.63-2
|
||||||
|
- rebuild
|
||||||
|
|
||||||
|
* Wed Apr 7 2010 Joe Orton <jorton@redhat.com> - 2010.63-1
|
||||||
|
- update to certdata.txt r1.63
|
||||||
|
- use upstream RCS version in Version
|
||||||
|
|
||||||
|
* Fri Mar 19 2010 Joe Orton <jorton@redhat.com> - 2010-4
|
||||||
|
- fix ca-bundle.crt (#575111)
|
||||||
|
|
||||||
|
* Thu Mar 18 2010 Joe Orton <jorton@redhat.com> - 2010-3
|
||||||
|
- update to certdata.txt r1.58
|
||||||
|
- add /etc/pki/tls/certs/ca-bundle.trust.crt using 'TRUSTED CERTICATE' format
|
||||||
|
- exclude ECC certs from the Java cacerts database
|
||||||
|
- catch keytool failures
|
||||||
|
- fail parsing certdata.txt on finding untrusted but not blacklisted cert
|
||||||
|
|
||||||
|
* Fri Jan 15 2010 Joe Orton <jorton@redhat.com> - 2010-2
|
||||||
|
- fix Java cacert database generation: use Subject rather than Issuer
|
||||||
|
for alias name; add diagnostics; fix some alias names.
|
||||||
|
|
||||||
|
* Mon Jan 11 2010 Joe Orton <jorton@redhat.com> - 2010-1
|
||||||
|
- adopt Python certdata.txt parsing script from Debian
|
||||||
|
|
||||||
|
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2009-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 22 2009 Joe Orton <jorton@redhat.com> 2009-1
|
||||||
|
- update to certdata.txt r1.53
|
||||||
|
|
||||||
|
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2008-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Oct 14 2008 Joe Orton <jorton@redhat.com> 2008-7
|
||||||
|
- update to certdata.txt r1.49
|
||||||
|
|
||||||
|
* Wed Jun 25 2008 Thomas Fitzsimmons <fitzsim@redhat.com> - 2008-6
|
||||||
|
- Change generate-cacerts.pl to produce pretty aliases.
|
||||||
|
|
||||||
|
* Mon Jun 2 2008 Joe Orton <jorton@redhat.com> 2008-5
|
||||||
|
- include /etc/pki/tls/cert.pem symlink to ca-bundle.crt
|
||||||
|
|
||||||
|
* Tue May 27 2008 Joe Orton <jorton@redhat.com> 2008-4
|
||||||
|
- use package name for temp dir, recreate it in prep
|
||||||
|
|
||||||
|
* Tue May 27 2008 Joe Orton <jorton@redhat.com> 2008-3
|
||||||
|
- fix source script perms
|
||||||
|
- mark packaged files as config(noreplace)
|
||||||
|
|
||||||
|
* Tue May 27 2008 Joe Orton <jorton@redhat.com> 2008-2
|
||||||
|
- add (but don't use) mkcabundle.pl
|
||||||
|
- tweak description
|
||||||
|
- use /usr/bin/keytool directly; BR java-openjdk
|
||||||
|
|
||||||
|
* Tue May 27 2008 Joe Orton <jorton@redhat.com> 2008-1
|
||||||
|
- Initial build (#448497)
|
||||||
Loading…
Reference in New Issue
Block a user