diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-03-12 17:14:09 +0100 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-03-14 15:45:40 +1000 |
| commit | 91bd45eb9ac26daf87abc2c21cb03143a745a420 (patch) | |
| tree | c9ac5e12b3e80f3370558c2efd45e56c6f2b8e7d /crypto/evp/keymgmt_meth.c | |
| parent | 3711f4c3fbb6344eca6c69c28000ecec3b7dbf7b (diff) | |
keymgmt_meth: remove two TODO 3.0
The first TODO 3.0 is not really a TODO, just a comment.
The second one is something that is needed for compatibility
with existing applications. There is no major reason in
trying to change this behavior right now.
Fixes #14400
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14534)
Diffstat (limited to 'crypto/evp/keymgmt_meth.c')
| -rw-r--r-- | crypto/evp/keymgmt_meth.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c index b42e2b77c9..0d7b54316b 100644 --- a/crypto/evp/keymgmt_meth.c +++ b/crypto/evp/keymgmt_meth.c @@ -287,9 +287,9 @@ void *evp_keymgmt_newdata(const EVP_KEYMGMT *keymgmt) void *provctx = ossl_provider_ctx(EVP_KEYMGMT_provider(keymgmt)); /* - * TODO(3.0) 'new' is currently mandatory on its own, but when new - * constructors appear, it won't be quite as mandatory, so we have - * a check for future cases. + * 'new' is currently mandatory on its own, but when new + * constructors appear, it won't be quite as mandatory, + * so we have a check for future cases. */ if (keymgmt->new == NULL) return NULL; @@ -320,7 +320,6 @@ int evp_keymgmt_gen_set_template(const EVP_KEYMGMT *keymgmt, void *genctx, * it allows the caller to set a template key, which is then ignored. * However, this is how the legacy methods (EVP_PKEY_METHOD) operate, * so we do this in the interest of backward compatibility. - * TODO(3.0) Investigate if we should change this behaviour. */ if (keymgmt->gen_set_template == NULL) return 1; |