mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
Remove some more CMS key downgrades
Fixes #12983 Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/13088)
This commit is contained in:
parent
7022d9b903
commit
0d30e15a57
14
apps/cms.c
14
apps/cms.c
@ -862,13 +862,6 @@ int cms_main(int argc, char **argv)
|
||||
key = load_key(keyfile, keyform, 0, passin, e, "signing key");
|
||||
if (key == NULL)
|
||||
goto end;
|
||||
|
||||
/*
|
||||
* TODO: Remove this when CMS has full support for provider-native
|
||||
* EVP_PKEYs
|
||||
*/
|
||||
if (EVP_PKEY_get0(key) == NULL)
|
||||
goto end;
|
||||
}
|
||||
|
||||
in = bio_open_default(infile, 'r', informat);
|
||||
@ -1067,13 +1060,6 @@ int cms_main(int argc, char **argv)
|
||||
goto end;
|
||||
}
|
||||
|
||||
/*
|
||||
* TODO: Remove this when CMS has full support for provider-native
|
||||
* EVP_PKEYs
|
||||
*/
|
||||
if (EVP_PKEY_get0(key) == NULL)
|
||||
goto end;
|
||||
|
||||
for (kparam = key_first; kparam; kparam = kparam->next) {
|
||||
if (kparam->idx == i) {
|
||||
tflags |= CMS_KEY_PARAM;
|
||||
|
Loading…
Reference in New Issue
Block a user