summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorTomas Mraz <tmraz@fedoraproject.org>2018-02-27 13:55:35 +0100
committerMatt Caswell <matt@openssl.org>2018-03-05 14:32:40 +0100
commitb524b808a1d1ba204dbdcbb42de4e3bddb3472ac (patch)
tree4b183c1e0737609272adea1a608f4c3c0064f65b /apps
parentIf not sending key_share (no TLSv1.3), return appropriately. (diff)
downloadopenssl-b524b808a1d1ba204dbdcbb42de4e3bddb3472ac.tar.xz
openssl-b524b808a1d1ba204dbdcbb42de4e3bddb3472ac.zip
Add support for .include directive in config files
Either files or directories of *.cnf or *.conf files can be included. Recursive inclusion of directories is not supported. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5351)
Diffstat (limited to 'apps')
-rw-r--r--apps/openssl-vms.cnf4
-rw-r--r--apps/openssl.cnf4
2 files changed, 8 insertions, 0 deletions
diff --git a/apps/openssl-vms.cnf b/apps/openssl-vms.cnf
index a3ca393018..f4a25112dc 100644
--- a/apps/openssl-vms.cnf
+++ b/apps/openssl-vms.cnf
@@ -3,6 +3,10 @@
# This is mostly being used for generation of certificate requests.
#
+# Note that you can include other files from the main configuration
+# file using the .include directive.
+#.include filename
+
# This definition stops the following lines choking if HOME isn't
# defined.
HOME = .
diff --git a/apps/openssl.cnf b/apps/openssl.cnf
index 32ee9e9fbb..7d1a8bb6e7 100644
--- a/apps/openssl.cnf
+++ b/apps/openssl.cnf
@@ -3,6 +3,10 @@
# This is mostly being used for generation of certificate requests.
#
+# Note that you can include other files from the main configuration
+# file using the .include directive.
+#.include filename
+
# This definition stops the following lines choking if HOME isn't
# defined.
HOME = .