summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2020-11-18 16:56:29 +1000
committerShane Lontis <shane.lontis@oracle.com>2021-01-20 15:35:26 +1000
commit3e878d924f138f4a71c04628b57be75f1d45ef8e (patch)
treeb30a318cd6e4c9991eaacb2a6c80ef8c32c006b6 /apps
parentc972577684f8627267556f0bffa3c4035e9456e4 (diff)
Remove pkey_downgrade from PKCS7 code
Fixes #12991 Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13435)
Diffstat (limited to 'apps')
-rw-r--r--apps/smime.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/apps/smime.c b/apps/smime.c
index b8451d8403..07abcbf8c9 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -478,14 +478,6 @@ int smime_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);
@@ -579,13 +571,6 @@ int smime_main(int argc, char **argv)
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;
-
if (!PKCS7_sign_add_signer(p7, signer, key, sign_md, flags))
goto end;
X509_free(signer);