[openssl-commits] [openssl] master update

[Ben Laurie]

The branch master has been updated
       via  6c3b566497d3147f3d701268d5280596ba9974d8 (commit)
      from  4eacfadedc790244017d88957cbba0f8626c2dbd (commit)


- Log -----------------------------------------------------------------
commit 6c3b566497d3147f3d701268d5280596ba9974d8
Author: Ben Laurie <ben at links.org>
Date:   Sun Dec 13 05:51:03 2015 +0000

    Remove no longer existant structure member and direct references to EVP_MD_CTX internals.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/evp/m_md2.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/crypto/evp/m_md2.c b/crypto/evp/m_md2.c
index 91b5e18..ed2dfd8 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