From: Ben Laurie <ben@links.org>
Date: Sun, 13 Dec 2015 05:51:03 +0000 (+0000)
Subject: Remove no longer existant structure member and direct references to EVP_MD_CTX internals.
X-Git-Tag: OpenSSL_1_1_0-pre2~242
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6c3b566497d3147f3d701268d5280596ba9974d8;p=oweals%2Fopenssl.git

Remove no longer existant structure member and direct references to EVP_MD_CTX internals.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/evp/m_md2.c b/crypto/evp/m_md2.c
index 91b5e18d10..ed2dfd88ea 100644
--- a/crypto/evp/m_md2.c
+++ b/crypto/evp/m_md2.c
@@ -69,19 +69,21 @@
 #  include <openssl/rsa.h>
 # endif
 
+#include "internal/evp_int.h"
+
 static int init(EVP_MD_CTX *ctx)
 {
-    return MD2_Init(ctx->md_data);
+    return MD2_Init(EVP_MD_CTX_md_data(ctx));
 }
 
 static int update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
-    return MD2_Update(ctx->md_data, data, count);
+    return MD2_Update(EVP_MD_CTX_md_data(ctx), data, count);
 }
 
 static int final(EVP_MD_CTX *ctx, unsigned char *md)
 {
-    return MD2_Final(md, ctx->md_data);
+    return MD2_Final(md, EVP_MD_CTX_md_data(ctx));
 }
 
 static const EVP_MD md2_md = {
@@ -94,13 +96,12 @@ static const EVP_MD md2_md = {
     final,
     NULL,
     NULL,
-    EVP_PKEY_RSA_method,
     MD2_BLOCK,
     sizeof(EVP_MD *) + sizeof(MD2_CTX),
 };
 
 const EVP_MD *EVP_md2(void)
 {
-    return (&md2_md);
+    return &md2_md;
 }
 #endif