diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-06-07 12:05:23 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-06-11 20:25:33 +1000 |
| commit | 83b4a24384e62ed8cf91f51bf9a303f98017e13e (patch) | |
| tree | 736978aa1768b11fae53518b03378c272180a70b /include | |
| parent | 3d700c3fde15086fcb514ab7c90097f7f0f5d75f (diff) | |
Make EVP_MD_CTX_ctrl() work for legacy use cases (ssl3).
This is still required currently by engines and digestsign/digestverify.
This PR contains merged in code from Richard Levitte's PR #9126.
[extended tests]
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9103)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/core_names.h | 3 | ||||
| -rw-r--r-- | include/openssl/evp.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h index 52a3f8b30b..a9a3b448e5 100644 --- a/include/openssl/core_names.h +++ b/include/openssl/core_names.h @@ -42,8 +42,7 @@ extern "C" { /* digest parameters */ #define OSSL_DIGEST_PARAM_XOFLEN "xoflen" -#define OSSL_DIGEST_PARAM_CMD "cmd" -#define OSSL_DIGEST_PARAM_MSG "msg" +#define OSSL_DIGEST_PARAM_SSL3_MS "ssl3-ms" #define OSSL_DIGEST_PARAM_PAD_TYPE "pad_type" #define OSSL_DIGEST_PARAM_MICALG "micalg" diff --git a/include/openssl/evp.h b/include/openssl/evp.h index afdd17cb5f..5fb04d15c3 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -542,7 +542,7 @@ void BIO_set_md(BIO *, const EVP_MD *md); int EVP_MD_CTX_set_params(EVP_MD_CTX *ctx, const OSSL_PARAM params[]); int EVP_MD_CTX_get_params(EVP_MD_CTX *ctx, const OSSL_PARAM params[]); -DEPRECATEDIN_3(int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2)) +int EVP_MD_CTX_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2); EVP_MD_CTX *EVP_MD_CTX_new(void); int EVP_MD_CTX_reset(EVP_MD_CTX *ctx); void EVP_MD_CTX_free(EVP_MD_CTX *ctx); |