From b2055d67f0d6cc3156ac89dae255e4abc8881b69 Mon Sep 17 00:00:00 2001 From: Shane Lontis Date: Wed, 18 Dec 2019 14:46:01 +1000 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/10602) --- crypto/evp/legacy_md5.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'crypto/evp/legacy_md5.c') diff --git a/crypto/evp/legacy_md5.c b/crypto/evp/legacy_md5.c index f125b33f91..9bb1258e47 100644 --- a/crypto/evp/legacy_md5.c +++ b/crypto/evp/legacy_md5.c @@ -7,29 +7,21 @@ * https://www.openssl.org/source/license.html */ -#include +#include +#include "crypto/evp.h" +#include "legacy_meth.h" -#ifndef OPENSSL_NO_MD5 - -# include -# include "crypto/evp.h" +IMPLEMENT_LEGACY_EVP_MD_METH(md5, MD5) static const EVP_MD md5_md = { NID_md5, NID_md5WithRSAEncryption, MD5_DIGEST_LENGTH, 0, - NULL, - NULL, - NULL, - NULL, - NULL, - MD5_CBLOCK, + LEGACY_EVP_MD_METH_TABLE(md5_init, md5_update, md5_final, NULL, MD5_CBLOCK) }; const EVP_MD *EVP_md5(void) { return &md5_md; } - -#endif /* OPENSSL_NO_MD5 */ -- cgit v1.2.3