diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-12-18 05:46:01 +0100 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-12-18 05:46:01 +0100 |
| commit | b2055d67f0d6cc3156ac89dae255e4abc8881b69 (patch) | |
| tree | 953d8331bae9fd2980f2380cd35cb341d842af29 /crypto/evp/legacy_mdc2.c | |
| parent | apps/speed.c: Fix eddsa sign and verify output with -multi option (diff) | |
| download | openssl-b2055d67f0d6cc3156ac89dae255e4abc8881b69.tar.xz openssl-b2055d67f0d6cc3156ac89dae255e4abc8881b69.zip | |
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_mdc2.c')
| -rw-r--r-- | crypto/evp/legacy_mdc2.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/crypto/evp/legacy_mdc2.c b/crypto/evp/legacy_mdc2.c index 5b51b015ea..9144a5715c 100644 --- a/crypto/evp/legacy_mdc2.c +++ b/crypto/evp/legacy_mdc2.c @@ -7,29 +7,22 @@ * https://www.openssl.org/source/license.html */ -#include <openssl/opensslconf.h> +#include <openssl/mdc2.h> +#include "crypto/evp.h" +#include "legacy_meth.h" -#ifndef OPENSSL_NO_MDC2 - -# include <openssl/mdc2.h> -# include "crypto/evp.h" +IMPLEMENT_LEGACY_EVP_MD_METH(mdc2, MDC2) static const EVP_MD mdc2_md = { NID_mdc2, NID_mdc2WithRSA, MDC2_DIGEST_LENGTH, 0, - NULL, - NULL, - NULL, - NULL, - NULL, - MDC2_BLOCK, + LEGACY_EVP_MD_METH_TABLE(mdc2_init, mdc2_update, mdc2_final, NULL, + MDC2_BLOCK), }; const EVP_MD *EVP_mdc2(void) { return &mdc2_md; } - -#endif /* OPENSSL_NO_MDC2 */ |