diff options
| author | Matt Caswell <matt@openssl.org> | 2020-02-14 22:49:26 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-02-21 20:17:02 +0000 |
| commit | 745fc918e7eeb86b2ac541325a8ae5c6e374ee56 (patch) | |
| tree | 9c79d0d5d784ec0251bb08f51ab20a04c42e69cc /crypto/property | |
| parent | 980a880ee5a85b94caac3049c7d3be0b765d97d3 (diff) | |
Introduce the provider property
Replace the properties default, fips and legacy with a single property
called "provider". So, for example, instead of writing "default=yes" to
get algorithms from the default provider you would instead write
"provider=default". We also have a new "fips" property to indicate that
an algorithm is compatible with FIPS mode. This applies to all the
algorithms in the FIPS provider, as well as any non-cryptographic
algorithms (currently only serializers).
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11097)
Diffstat (limited to 'crypto/property')
| -rw-r--r-- | crypto/property/property_parse.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c index 6476f65bc7..5af67a7a0b 100644 --- a/crypto/property/property_parse.c +++ b/crypto/property/property_parse.c @@ -562,12 +562,9 @@ OSSL_PROPERTY_LIST *ossl_property_merge(const OSSL_PROPERTY_LIST *a, int ossl_property_parse_init(OPENSSL_CTX *ctx) { static const char *const predefined_names[] = { - "default", /* Being provided by the default built-in provider */ - "legacy", /* Provided by the legacy provider */ - "provider", /* Name of provider (default, fips) */ + "provider", /* Name of provider (default, legacy, fips) */ "version", /* Version number of this provider */ - "fips", /* FIPS supporting provider */ - "engine", /* An old style engine masquerading as a provider */ + "fips", /* FIPS validated or FIPS supporting algorithm */ "format", /* output format for serializers */ "type", /* output type for serializers */ }; |