diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-10-26 13:22:54 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-11 11:42:06 +0100 |
| commit | 2c090c1d1b00fe49dd2911674e26c629f123c44f (patch) | |
| tree | 6966886dfcde93a1ea601c5a13af79c7f3aa6041 /providers/defltprov.c | |
| parent | DECODER: Add tracing (diff) | |
| download | openssl-2c090c1d1b00fe49dd2911674e26c629f123c44f.tar.xz openssl-2c090c1d1b00fe49dd2911674e26c629f123c44f.zip | |
PROV: Re-implement all the keypair decoders
The base functionality to implement the keypair decoders doesn't
change much, but this results in a more massive amount of
OSSL_DISPATCH and OSSL_ALGORITHM arrays, to support a fine grained
selection of implementation based on what parts of the keypair
structure (combinations of key parameters, public key and private key)
should be expected as input, the input type ("DER", "PEM", ...) and the
outermost input structure ("pkcs8", "SubjectPublicKeyInfo", key
type specific structures, ...).
We add support for the generic structure name "type-specific", to
allow selecting that without knowing the exact name of that structure.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13248)
Diffstat (limited to 'providers/defltprov.c')
| -rw-r--r-- | providers/defltprov.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c index 425ec9a6c8..8ce6c92b3e 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -453,15 +453,11 @@ static const OSSL_ALGORITHM deflt_encoder[] = { #undef ENCODER static const OSSL_ALGORITHM deflt_decoder[] = { -#define DECODER(name, _fips, _input, func_table) \ - { name, \ - "provider=default,fips=" _fips ",input=" _input, \ - (func_table) } - +#define DECODER_PROVIDER "default" #include "decoders.inc" { NULL, NULL, NULL } +#undef DECODER_PROVIDER }; -#undef DECODER static const OSSL_ALGORITHM deflt_store[] = { #define STORE(name, _fips, func_table) \ |