diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-08-16 21:25:08 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-08-21 09:23:58 +0200 |
| commit | ece9304c96f71277ca95696d9bc49fdec51e9f17 (patch) | |
| tree | 7038f8760e1538754bc67371cb5a466a83935dad /providers/defltprov.c | |
| parent | f650993f1de3dbb5eda9009ad0c4895a7b1b7fe2 (diff) | |
Rename OSSL_SERIALIZER / OSSL_DESERIALIZER to OSSL_ENCODE / OSSL_DECODE
Fixes #12455
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12660)
Diffstat (limited to 'providers/defltprov.c')
| -rw-r--r-- | providers/defltprov.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c index 083373a066..9aefa801a1 100644 --- a/providers/defltprov.c +++ b/providers/defltprov.c @@ -395,27 +395,27 @@ static const OSSL_ALGORITHM deflt_keymgmt[] = { { NULL, NULL, NULL } }; -static const OSSL_ALGORITHM deflt_serializer[] = { -#define SER(name, fips, format, type, func_table) \ +static const OSSL_ALGORITHM deflt_encoder[] = { +#define ENCODER(name, fips, format, type, func_table) \ { name, \ "provider=default,fips=" fips ",format=" format ",type=" type, \ (func_table) } -#include "serializers.inc" +#include "encoders.inc" { NULL, NULL, NULL } }; -#undef SER +#undef ENCODER -static const OSSL_ALGORITHM deflt_deserializer[] = { -#define DESER(name, fips, input, func_table) \ +static const OSSL_ALGORITHM deflt_decoder[] = { +#define DECODER(name, fips, input, func_table) \ { name, \ "provider=default,fips=" fips ",input=" input, \ (func_table) } -#include "deserializers.inc" +#include "decoders.inc" { NULL, NULL, NULL } }; -#undef DESER +#undef DECODER static const OSSL_ALGORITHM *deflt_query(void *provctx, int operation_id, int *no_cache) @@ -441,10 +441,10 @@ static const OSSL_ALGORITHM *deflt_query(void *provctx, int operation_id, return deflt_signature; case OSSL_OP_ASYM_CIPHER: return deflt_asym_cipher; - case OSSL_OP_SERIALIZER: - return deflt_serializer; - case OSSL_OP_DESERIALIZER: - return deflt_deserializer; + case OSSL_OP_ENCODER: + return deflt_encoder; + case OSSL_OP_DECODER: + return deflt_decoder; } return NULL; } |