diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-12-18 14:46:01 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-12-18 14:46:01 +1000 |
| commit | b2055d67f0d6cc3156ac89dae255e4abc8881b69 (patch) | |
| tree | 953d8331bae9fd2980f2380cd35cb341d842af29 /crypto/evp/legacy_md5_sha1.c | |
| parent | 1ac7e15375be39c8f03171c02658cf703f58217a (diff) | |
Cleanup legacy digest methods.
Macros have been added to generate the simple legacy methods.
Engines and EVP_MD_METH_get methods still require access to the old legacy methods,
so they needed to be added back in.
They may only be removed after engines are deprecated and removed.
Removed some unnecessary #includes and #ifndef guards (which are done in build.info instead).
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10602)
Diffstat (limited to 'crypto/evp/legacy_md5_sha1.c')
| -rw-r--r-- | crypto/evp/legacy_md5_sha1.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/crypto/evp/legacy_md5_sha1.c b/crypto/evp/legacy_md5_sha1.c index a23febfd53..6da6b4fd95 100644 --- a/crypto/evp/legacy_md5_sha1.c +++ b/crypto/evp/legacy_md5_sha1.c @@ -7,31 +7,27 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/opensslconf.h> - +#include "crypto/evp.h" #include "prov/md5_sha1.h" /* diverse MD5_SHA1 macros */ +#include "legacy_meth.h" -#ifndef OPENSSL_NO_MD5 - -# include <openssl/obj_mac.h> -# include "crypto/evp.h" +IMPLEMENT_LEGACY_EVP_MD_METH_LC(md5_sha1_int, md5_sha1) +static int md5_sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int mslen, void *ms) +{ + return md5_sha1_ctrl(EVP_MD_CTX_md_data(ctx), cmd, mslen, ms); +} static const EVP_MD md5_sha1_md = { NID_md5_sha1, NID_md5_sha1, MD5_SHA1_DIGEST_LENGTH, 0, - NULL, - NULL, - NULL, - NULL, - NULL, - MD5_SHA1_CBLOCK, + LEGACY_EVP_MD_METH_TABLE(md5_sha1_int_init, md5_sha1_int_update, + md5_sha1_int_final, md5_sha1_int_ctrl, + MD5_SHA1_CBLOCK), }; const EVP_MD *EVP_md5_sha1(void) { return &md5_sha1_md; } - -#endif /* OPENSSL_NO_MD5 */ |