diff options
| author | Matt Caswell <matt@openssl.org> | 2020-10-06 18:02:45 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-10-15 11:00:28 +0200 |
| commit | 0d30e15a57fdd9c27a9148c17289a1005345f0c7 (patch) | |
| tree | 363fa64e3e1fc47209a3dbb544637559be86765d | |
| parent | Remove CMS recipient info information out of the algorithm implementations (diff) | |
| download | openssl-0d30e15a57fdd9c27a9148c17289a1005345f0c7.tar.xz openssl-0d30e15a57fdd9c27a9148c17289a1005345f0c7.zip | |
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)
| -rw-r--r-- | apps/cms.c | 14 |
1 files changed, 0 insertions, 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; |