diff options
| author | Pauli <paul.dale@oracle.com> | 2020-07-27 14:47:59 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-07-30 20:15:59 +1000 |
| commit | a3f15e237c0325718f488ebf9a242c031f4f864e (patch) | |
| tree | e7967fa597f7e7ba61ea7bd5d5de7541bcf709bf /providers/defltprov.c | |
| parent | dfc0857d8191d43be320f4ba472b7c782248a35d (diff) | |
| download | openssl-a3f15e237c0325718f488ebf9a242c031f4f864e.zip openssl-a3f15e237c0325718f488ebf9a242c031f4f864e.tar.gz openssl-a3f15e237c0325718f488ebf9a242c031f4f864e.tar.bz2 | |
deserialisation: add deserialisation to the base provider
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12104)
Diffstat (limited to 'providers/defltprov.c')
| -rw-r--r-- | providers/defltprov.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c index fa6e18f..fa2fadb 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -388,7 +388,7 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = { static const OSSL_ALGORITHM deflt_serializer[] = { #define SER(name, fips, format, type, func_table) \ { name, \ - "provider=default,fips=" fips ",format=" format ",type=" type, \ + "provider=default,fips=" fips ",format=" format ",type=" type, \ (func_table) } #include "serializers.inc" @@ -397,16 +397,15 @@ static const OSSL_ALGORITHM deflt_serializer[] = { #undef SER static const OSSL_ALGORITHM deflt_deserializer[] = { - { "RSA", "provider=default,fips=yes,input=der", - der_to_rsa_deserializer_functions }, - { "RSA-PSS", "provider=default,fips=yes,input=der", - der_to_rsapss_deserializer_functions }, - - { "DER", "provider=default,fips=yes,input=pem", - pem_to_der_deserializer_functions }, +#define DESER(name, fips, input, func_table) \ + { name, \ + "provider=default,fips=" fips ",input=" input, \ + (func_table) } +#include "deserializers.inc" { NULL, NULL, NULL } }; +#undef DESER static const OSSL_ALGORITHM *deflt_query(void *provctx, int operation_id, int *no_cache) |