diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2020-05-07 15:31:05 +1000 |
---|---|---|
committer | Shane Lontis <shane.lontis@oracle.com> | 2020-05-07 15:31:05 +1000 |
commit | 5e77b79a8c47f0801f656cfccfcbaaa3ca1035b4 (patch) | |
tree | f93d6603fd386aa19d5536a0a66f5b882aebc7cf /include | |
parent | 9f2058611f7aec733d4a476f4f28c895d9e5667b (diff) |
Remove gen_get_params & gen_gettable_params from keygen operation
EVP_PKEY_CTX_gettable_params() was missing code for the keygen operation.
After adding it it was noticed that it is probably not required for this type, so instead
the gen_get_params and gen_gettable_params have been remnoved from the provider interface.
gen_get_params was only implemented for ec to get the curve name. This seems redundant
since normally you would set parameters into the keygen_init() and then generate a key.
Normally you would expect to extract data from the key - not the object that we just set up
to do the keygen.
Added a simple settable and gettable test into a test that does keygen.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11683)
Diffstat (limited to 'include')
-rw-r--r-- | include/crypto/evp.h | 4 | ||||
-rw-r--r-- | include/openssl/core_numbers.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 852e82518e..ee4b6221e6 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -678,10 +678,6 @@ int evp_keymgmt_gen_set_params(const EVP_KEYMGMT *keymgmt, void *genctx, const OSSL_PARAM params[]); const OSSL_PARAM * evp_keymgmt_gen_settable_params(const EVP_KEYMGMT *keymgmt); -int evp_keymgmt_gen_get_params(const EVP_KEYMGMT *keymgmt, void *genctx, - OSSL_PARAM params[]); -const OSSL_PARAM * -evp_keymgmt_gen_gettable_params(const EVP_KEYMGMT *keymgmt); void *evp_keymgmt_gen(const EVP_KEYMGMT *keymgmt, void *genctx, OSSL_CALLBACK *cb, void *cbarg); void evp_keymgmt_gen_cleanup(const EVP_KEYMGMT *keymgmt, void *genctx); diff --git a/include/openssl/core_numbers.h b/include/openssl/core_numbers.h index aaf281b1fe..2cf2f27715 100644 --- a/include/openssl/core_numbers.h +++ b/include/openssl/core_numbers.h @@ -392,10 +392,8 @@ OSSL_CORE_MAKE_FUNC(void *, OP_keymgmt_new, (void *provctx)) # define OSSL_FUNC_KEYMGMT_GEN_SET_TEMPLATE 3 # define OSSL_FUNC_KEYMGMT_GEN_SET_PARAMS 4 # define OSSL_FUNC_KEYMGMT_GEN_SETTABLE_PARAMS 5 -# define OSSL_FUNC_KEYMGMT_GEN_GET_PARAMS 6 -# define OSSL_FUNC_KEYMGMT_GEN_GETTABLE_PARAMS 7 -# define OSSL_FUNC_KEYMGMT_GEN 8 -# define OSSL_FUNC_KEYMGMT_GEN_CLEANUP 9 +# define OSSL_FUNC_KEYMGMT_GEN 6 +# define OSSL_FUNC_KEYMGMT_GEN_CLEANUP 7 OSSL_CORE_MAKE_FUNC(void *, OP_keymgmt_gen_init, (void *provctx, int selection)) OSSL_CORE_MAKE_FUNC(int, OP_keymgmt_gen_set_template, |