summaryrefslogtreecommitdiffstats
path: root/crypto/cpt_err.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-03-20 16:53:19 +0100
committerRichard Levitte <levitte@openssl.org>2019-04-03 11:42:48 +0200
commitabbc2c408385326d9c9cd60b92a6c92b945c1d96 (patch)
treedff53671d8409ea59c2f0b7dbc704d6dccbf0fb9 /crypto/cpt_err.c
parentac1055ef13ccb5789e2bed7b9688c8eb16dd05ce (diff)
Replumbing: add a configuration module for providers
This configuration module supports a configuration structure pretty much like the engine configuration module, i.e. something like this: openssl_conf = openssl_init [openssl_init] providers = provider_section [provider_section] # Configure the provider named "foo" foo = foo_section # Configure the provider named "bar" bar = bar_section [foo_section] # Override name given in the provider section identity = myfoo # The exact path of the module. This is platform specific module_path = /opt/openssl/modules/foo.so # Whether it should be automatically activated. Value is unimportant activate = whatever # Anything else goes as well, and becomes parameters that the # provider can get what = 1 # sub-sections will be followed as well ever = ever_section [ever_section] cookie = monster All the configurations in a provider section and its sub-sections become parameters for the provider to get, i.e. the "foo" provider will be able to get values for the following keys (with associated values shown): identity => myfoo module_path => /opt/openssl/modules/foo.so activate => whatever what => 1 ever.cookie => monster Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/8549)
Diffstat (limited to 'crypto/cpt_err.c')
-rw-r--r--crypto/cpt_err.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c
index cca8037855..8c386925f8 100644
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -63,6 +63,10 @@ static const ERR_STRING_DATA CRYPTO_str_functs[] = {
"pkey_siphash_init"},
{ERR_PACK(ERR_LIB_CRYPTO, CRYPTO_F_PROVIDER_ACTIVATE, 0),
"provider_activate"},
+ {ERR_PACK(ERR_LIB_CRYPTO, CRYPTO_F_PROVIDER_CONF_INIT, 0),
+ "provider_conf_init"},
+ {ERR_PACK(ERR_LIB_CRYPTO, CRYPTO_F_PROVIDER_CONF_LOAD, 0),
+ "provider_conf_load"},
{ERR_PACK(ERR_LIB_CRYPTO, CRYPTO_F_PROVIDER_NEW, 0), "provider_new"},
{ERR_PACK(ERR_LIB_CRYPTO, CRYPTO_F_PROVIDER_STORE_NEW, 0),
"provider_store_new"},
@@ -79,6 +83,8 @@ static const ERR_STRING_DATA CRYPTO_str_reasons[] = {
"odd number of digits"},
{ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PROVIDER_ALREADY_EXISTS),
"provider already exists"},
+ {ERR_PACK(ERR_LIB_CRYPTO, 0, CRYPTO_R_PROVIDER_SECTION_ERROR),
+ "provider section error"},
{0, NULL}
};