From: Tomas Mraz Date: Fri, 12 Mar 2021 16:14:09 +0000 (+0100) Subject: keymgmt_meth: remove two TODO 3.0 X-Git-Tag: openssl-3.0.0-alpha14~284 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91bd45eb9ac26daf87abc2c21cb03143a745a420;p=thirdparty%2Fopenssl.git 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 Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/14534) --- diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c index b42e2b77c92..0d7b54316b8 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;