2021-04-09 20:24:41 +00:00
|
|
|
From 6790960076742a9053c624e26fbb87fcd5789e27 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Tomas Mraz <tmraz@fedoraproject.org>
|
|
|
|
|
Date: Thu, 24 Sep 2020 09:17:26 +0200
|
|
|
|
|
Subject: Override default paths for the CA directory tree
|
|
|
|
|
|
|
|
|
|
Also add default section to load crypto-policies configuration
|
|
|
|
|
for TLS.
|
|
|
|
|
|
|
|
|
|
It needs to be reverted before running tests.
|
|
|
|
|
|
|
|
|
|
(was openssl-1.1.1-conf-paths.patch)
|
|
|
|
|
---
|
|
|
|
|
apps/CA.pl.in | 2 +-
|
|
|
|
|
apps/openssl.cnf | 20 ++++++++++++++++++--
|
|
|
|
|
2 files changed, 19 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/apps/CA.pl.in b/apps/CA.pl.in
|
|
|
|
|
index c0afb96716..d6a5fabd16 100644
|
|
|
|
|
--- a/apps/CA.pl.in
|
|
|
|
|
+++ b/apps/CA.pl.in
|
|
|
|
|
@@ -29,7 +29,7 @@ my $X509 = "$openssl x509";
|
2020-10-15 20:27:53 +00:00
|
|
|
my $PKCS12 = "$openssl pkcs12";
|
|
|
|
|
|
2021-04-09 20:24:41 +00:00
|
|
|
# Default values for various configuration settings.
|
2020-10-15 20:27:53 +00:00
|
|
|
-my $CATOP = "./demoCA";
|
|
|
|
|
+my $CATOP = "/etc/pki/CA";
|
|
|
|
|
my $CAKEY = "cakey.pem";
|
|
|
|
|
my $CAREQ = "careq.pem";
|
|
|
|
|
my $CACERT = "cacert.pem";
|
2021-04-09 20:24:41 +00:00
|
|
|
diff --git a/apps/openssl.cnf b/apps/openssl.cnf
|
|
|
|
|
index eb25a0ac48..2479943fde 100644
|
|
|
|
|
--- a/apps/openssl.cnf
|
|
|
|
|
+++ b/apps/openssl.cnf
|
|
|
|
|
@@ -31,6 +31,22 @@ oid_section = new_oids
|
2020-10-15 20:27:53 +00:00
|
|
|
# (Alternatively, use a configuration file that has only
|
|
|
|
|
# X.509v3 extensions in its main [= default] section.)
|
|
|
|
|
|
|
|
|
|
+# Load default TLS policy configuration
|
|
|
|
|
+
|
|
|
|
|
+openssl_conf = default_modules
|
|
|
|
|
+
|
|
|
|
|
+[ default_modules ]
|
|
|
|
|
+
|
|
|
|
|
+ssl_conf = ssl_module
|
|
|
|
|
+
|
|
|
|
|
+[ ssl_module ]
|
|
|
|
|
+
|
|
|
|
|
+system_default = crypto_policy
|
|
|
|
|
+
|
|
|
|
|
+[ crypto_policy ]
|
|
|
|
|
+
|
|
|
|
|
+.include = /etc/crypto-policies/back-ends/opensslcnf.config
|
|
|
|
|
+
|
|
|
|
|
[ new_oids ]
|
|
|
|
|
# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
|
2021-04-09 20:24:41 +00:00
|
|
|
# Add a simple OID like this:
|
|
|
|
|
@@ -72,7 +88,7 @@ default_ca = CA_default # The default ca section
|
2020-10-15 20:27:53 +00:00
|
|
|
####################################################################
|
|
|
|
|
[ CA_default ]
|
|
|
|
|
|
|
|
|
|
-dir = ./demoCA # Where everything is kept
|
|
|
|
|
+dir = /etc/pki/CA # Where everything is kept
|
|
|
|
|
certs = $dir/certs # Where the issued certs are kept
|
|
|
|
|
crl_dir = $dir/crl # Where the issued crl are kept
|
|
|
|
|
database = $dir/index.txt # database index file.
|
2021-04-09 20:24:41 +00:00
|
|
|
@@ -304,7 +320,7 @@ default_tsa = tsa_config1 # the default TSA section
|
2020-10-15 20:27:53 +00:00
|
|
|
[ tsa_config1 ]
|
|
|
|
|
|
|
|
|
|
# These are used by the TSA reply generation only.
|
|
|
|
|
-dir = ./demoCA # TSA root directory
|
|
|
|
|
+dir = /etc/pki/CA # TSA root directory
|
|
|
|
|
serial = $dir/tsaserial # The current serial number (mandatory)
|
|
|
|
|
crypto_device = builtin # OpenSSL engine to use for signing
|
|
|
|
|
signer_cert = $dir/tsacert.pem # The TSA signing certificate
|
2021-04-09 20:24:41 +00:00
|
|
|
--
|
|
|
|
|
2.26.2
|
|
|
|
|
|
