diff options
| author | Tomas Mraz <tmraz@fedoraproject.org> | 2018-02-27 13:55:35 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-05 14:32:40 +0100 |
| commit | b524b808a1d1ba204dbdcbb42de4e3bddb3472ac (patch) | |
| tree | 4b183c1e0737609272adea1a608f4c3c0064f65b /include | |
| parent | If not sending key_share (no TLSv1.3), return appropriately. (diff) | |
| download | openssl-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 'include')
| -rw-r--r-- | include/openssl/conferr.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/openssl/conferr.h b/include/openssl/conferr.h index d623cea6d5..d2d0c7bace 100644 --- a/include/openssl/conferr.h +++ b/include/openssl/conferr.h @@ -25,6 +25,7 @@ int ERR_load_CONF_strings(void); # define CONF_F_CONF_PARSE_LIST 119 # define CONF_F_DEF_LOAD 120 # define CONF_F_DEF_LOAD_BIO 121 +# define CONF_F_GET_NEXT_FILE 107 # define CONF_F_MODULE_INIT 115 # define CONF_F_MODULE_LOAD_DSO 117 # define CONF_F_MODULE_RUN 118 @@ -37,6 +38,7 @@ int ERR_load_CONF_strings(void); # define CONF_F_NCONF_LOAD_BIO 110 # define CONF_F_NCONF_LOAD_FP 114 # define CONF_F_NCONF_NEW 111 +# define CONF_F_PROCESS_INCLUDE 116 # define CONF_F_STR_COPY 101 /* @@ -54,6 +56,7 @@ int ERR_load_CONF_strings(void); # define CONF_R_NO_SECTION 107 # define CONF_R_NO_SUCH_FILE 114 # define CONF_R_NO_VALUE 108 +# define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111 # define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103 # define CONF_R_UNKNOWN_MODULE_NAME 113 # define CONF_R_VARIABLE_EXPANSION_TOO_LONG 116 |