From 0d30e15a57fdd9c27a9148c17289a1005345f0c7 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 6 Oct 2020 17:02:45 +0100 Subject: [PATCH] Remove some more CMS key downgrades Fixes #12983 Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/13088) --- apps/cms.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/apps/cms.c b/apps/cms.c index 91d951980d..37b1e96a14 100644 --- a/apps/cms.c +++ b/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;