diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2021-03-12 12:32:44 +1000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-03-14 15:37:18 +1000 |
| commit | 0fc39c9030df3e313c7ee08a3aefec8ab44bcd9a (patch) | |
| tree | 34f6ad98787d3bcf0ebe3e95ac712332a5c440cd /crypto/rsa | |
| parent | 8bfb8f34580cac3a53b0ac88dec566c19d6c8c53 (diff) | |
Remove TODO in rsa_ameth.c
Fixes #14390
The only caller of this function tests EVP_KEYMGMT_is_a() beforehand
which will fail if the RSA key types do not match. So the test is not
necessary. The assert has been removed when it does the test.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14524)
Diffstat (limited to 'crypto/rsa')
| -rw-r--r-- | crypto/rsa/rsa_ameth.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c index 479155b90b..e9e442606d 100644 --- a/crypto/rsa/rsa_ameth.c +++ b/crypto/rsa/rsa_ameth.c @@ -856,15 +856,8 @@ static size_t rsa_pkey_dirty_cnt(const EVP_PKEY *pkey) } /* - * For the moment, we trust the call path, where keys going through - * rsa_pkey_export_to() match a KEYMGMT for the "RSA" keytype, while - * keys going through rsa_pss_pkey_export_to() match a KEYMGMT for the - * "RSA-PSS" keytype. - * TODO(3.0) Investigate whether we should simply continue to trust the - * call path, or if we should strengthen this function by checking that - * |rsa_type| matches the RSA key subtype. The latter requires ensuring - * that the type flag for the RSA key is properly set by other functions - * in this file. + * There is no need to do RSA_test_flags(rsa, RSA_FLAG_TYPE_RSASSAPSS) + * checks in this method since the caller tests EVP_KEYMGMT_is_a() first. */ static int rsa_int_export_to(const EVP_PKEY *from, int rsa_type, void *to_keydata, EVP_KEYMGMT *to_keymgmt, |