diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2015-12-02 13:57:04 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2015-12-02 17:52:01 +0000 |
commit | 7f572e958b13041056f377a62d3219633cfb1e8a (patch) | |
tree | e25e20a9a52529c804812272317c7fbc03e5d978 /engines | |
parent | 0aca86b313d286be979629a3193a12e17bf7171a (diff) |
Remove legacy sign/verify from EVP_MD.
Remove sign/verify and required_pkey_type fields of EVP_MD: these are a
legacy from when digests were linked to public key types. All signing is
now handled by the corresponding EVP_PKEY_METHOD.
Only allow supported digest types in RSA EVP_PKEY_METHOD: other algorithms
already block unsupported types.
Remove now obsolete EVP_dss1() and EVP_ecdsa().
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'engines')
-rw-r--r-- | engines/ccgost/gost_crypt.c | 3 | ||||
-rw-r--r-- | engines/ccgost/gost_md.c | 5 | ||||
-rw-r--r-- | engines/e_dasync.c | 3 | ||||
-rw-r--r-- | engines/e_ossltest.c | 13 |
4 files changed, 6 insertions, 18 deletions
diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c index e2a2ff6878..fb066d9534 100644 --- a/engines/ccgost/gost_crypt.c +++ b/engines/ccgost/gost_crypt.c @@ -95,9 +95,6 @@ EVP_MD imit_gost_cpa = { gost_imit_final, gost_imit_copy, gost_imit_cleanup, - NULL, - NULL, - {0, 0, 0, 0, 0}, 8, sizeof(struct ossl_gost_imit_ctx), gost_imit_ctrl diff --git a/engines/ccgost/gost_md.c b/engines/ccgost/gost_md.c index 1ccc6be0e9..6c96a1bd24 100644 --- a/engines/ccgost/gost_md.c +++ b/engines/ccgost/gost_md.c @@ -23,15 +23,12 @@ EVP_MD digest_gost = { NID_id_GostR3411_94, NID_undef, 32, - EVP_MD_FLAG_PKEY_METHOD_SIGNATURE, + 0, gost_digest_init, gost_digest_update, gost_digest_final, gost_digest_copy, gost_digest_cleanup, - NULL, - NULL, - {NID_undef, NID_undef, 0, 0, 0}, 32, sizeof(struct ossl_gost_digest_ctx), NULL diff --git a/engines/e_dasync.c b/engines/e_dasync.c index 04f72a46fd..c31b43a36d 100644 --- a/engines/e_dasync.c +++ b/engines/e_dasync.c @@ -94,13 +94,12 @@ static const EVP_MD dasync_sha1 = { NID_sha1, NID_sha1WithRSAEncryption, SHA_DIGEST_LENGTH, - EVP_MD_FLAG_PKEY_METHOD_SIGNATURE | EVP_MD_FLAG_DIGALGID_ABSENT, + EVP_MD_FLAG_DIGALGID_ABSENT, dasync_sha1_init, dasync_sha1_update, dasync_sha1_final, NULL, NULL, - EVP_PKEY_NULL_method, SHA_CBLOCK, sizeof(EVP_MD *) + sizeof(SHA_CTX), }; diff --git a/engines/e_ossltest.c b/engines/e_ossltest.c index b3b9bc0395..94e53cd0ca 100644 --- a/engines/e_ossltest.c +++ b/engines/e_ossltest.c @@ -107,7 +107,6 @@ static const EVP_MD digest_md5 = { digest_md5_final, NULL, NULL, - EVP_PKEY_RSA_method, MD5_CBLOCK, sizeof(EVP_MD *) + sizeof(MD5_CTX), }; @@ -122,13 +121,12 @@ static const EVP_MD digest_sha1 = { NID_sha1, NID_sha1WithRSAEncryption, SHA_DIGEST_LENGTH, - EVP_MD_FLAG_PKEY_METHOD_SIGNATURE | EVP_MD_FLAG_DIGALGID_ABSENT, + EVP_MD_FLAG_DIGALGID_ABSENT, digest_sha1_init, digest_sha1_update, digest_sha1_final, NULL, NULL, - EVP_PKEY_NULL_method, SHA_CBLOCK, sizeof(EVP_MD *) + sizeof(SHA_CTX), }; @@ -143,13 +141,12 @@ static const EVP_MD digest_sha256 = { NID_sha256, NID_sha256WithRSAEncryption, SHA256_DIGEST_LENGTH, - EVP_MD_FLAG_PKEY_METHOD_SIGNATURE | EVP_MD_FLAG_DIGALGID_ABSENT, + EVP_MD_FLAG_DIGALGID_ABSENT, digest_sha256_init, digest_sha256_update, digest_sha256_final, NULL, NULL, - EVP_PKEY_NULL_method, SHA256_CBLOCK, sizeof(EVP_MD *) + sizeof(SHA256_CTX), }; @@ -166,13 +163,12 @@ static const EVP_MD digest_sha384 = { NID_sha384, NID_sha384WithRSAEncryption, SHA384_DIGEST_LENGTH, - EVP_MD_FLAG_PKEY_METHOD_SIGNATURE | EVP_MD_FLAG_DIGALGID_ABSENT, + EVP_MD_FLAG_DIGALGID_ABSENT, digest_sha384_init, digest_sha512_update, digest_sha384_final, NULL, NULL, - EVP_PKEY_NULL_method, SHA512_CBLOCK, sizeof(EVP_MD *) + sizeof(SHA512_CTX), }; @@ -181,13 +177,12 @@ static const EVP_MD digest_sha512 = { NID_sha512, NID_sha512WithRSAEncryption, SHA512_DIGEST_LENGTH, - EVP_MD_FLAG_PKEY_METHOD_SIGNATURE | EVP_MD_FLAG_DIGALGID_ABSENT, + EVP_MD_FLAG_DIGALGID_ABSENT, digest_sha512_init, digest_sha512_update, digest_sha512_final, NULL, NULL, - EVP_PKEY_NULL_method, SHA512_CBLOCK, sizeof(EVP_MD *) + sizeof(SHA512_CTX), }; |