diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-08-03 07:22:37 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-08-04 10:19:08 +0200 |
| commit | 4c525cb5b6bbc85de592cb7bf623676a914b8dae (patch) | |
| tree | e5a0bb2b32ac8e4fc1ab4e71a58c95e9a05d00f9 | |
| parent | aff8c0a411824f29687a54a3aa82f7e770faff48 (diff) | |
DESERIALIZER: Fix EVP_PKEY construction by export
When the keymgmt provider and the deserializer provider differ,
deserialization uses the deserializer export function instead of the
keymgmt load, with a selection of what parts should be exported. That
selection was set to OSSL_KEYMGMT_SELECT_ALL_PARAMETERS when it should
have been OSSL_KEYMGMT_SELECT_ALL.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/12571)
| -rw-r--r-- | crypto/serializer/deserializer_pkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/serializer/deserializer_pkey.c b/crypto/serializer/deserializer_pkey.c index e5e8bfda6f..44e7eb56ee 100644 --- a/crypto/serializer/deserializer_pkey.c +++ b/crypto/serializer/deserializer_pkey.c @@ -181,7 +181,7 @@ static int deser_construct_EVP_PKEY(OSSL_DESERIALIZER_INSTANCE *deser_inst, OSSL_DESERIALIZER_provider(deser); /* - * If the EVP_KEYMGMT and the OSSL_DDESERIALIZER are from the + * If the EVP_KEYMGMT and the OSSL_DESERIALIZER are from the * same provider, we assume that the KEYMGMT has a key loading * function that can handle the provider reference we hold. * @@ -195,7 +195,7 @@ static int deser_construct_EVP_PKEY(OSSL_DESERIALIZER_INSTANCE *deser_inst, import_data.keymgmt = keymgmt; import_data.keydata = NULL; - import_data.selection = OSSL_KEYMGMT_SELECT_ALL_PARAMETERS; + import_data.selection = OSSL_KEYMGMT_SELECT_ALL; /* * No need to check for errors here, the value of |