New upstream version 15.3upstream/15.3

1 files changed, 7 insertions, 13 deletions

diff --git a/Cryptlib/OpenSSL/crypto/evp/m_wp.c b/Cryptlib/OpenSSL/crypto/evp/m_wp.c
index 94fac226..a890939e 100644
--- a/Cryptlib/OpenSSL/crypto/evp/m_wp.c
+++ b/Cryptlib/OpenSSL/crypto/evp/m_wp.c
@@ -1,14 +1,7 @@
-/*
- * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the OpenSSL license (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
+/* crypto/evp/m_wp.c */
 
 #include <stdio.h>
-#include "internal/cryptlib.h"
+#include "cryptlib.h"
 
 #ifndef OPENSSL_NO_WHIRLPOOL
 
@@ -16,21 +9,21 @@
 # include <openssl/objects.h>
 # include <openssl/x509.h>
 # include <openssl/whrlpool.h>
-# include "internal/evp_int.h"
+# include "evp_locl.h"
 
 static int init(EVP_MD_CTX *ctx)
 {
-    return WHIRLPOOL_Init(EVP_MD_CTX_md_data(ctx));
+    return WHIRLPOOL_Init(ctx->md_data);
 }
 
 static int update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
-    return WHIRLPOOL_Update(EVP_MD_CTX_md_data(ctx), data, count);
+    return WHIRLPOOL_Update(ctx->md_data, data, count);
 }
 
 static int final(EVP_MD_CTX *ctx, unsigned char *md)
 {
-    return WHIRLPOOL_Final(md, EVP_MD_CTX_md_data(ctx));
+    return WHIRLPOOL_Final(md, ctx->md_data);
 }
 
 static const EVP_MD whirlpool_md = {
@@ -43,6 +36,7 @@ static const EVP_MD whirlpool_md = {
     final,
     NULL,
     NULL,
+    EVP_PKEY_NULL_method,
     WHIRLPOOL_BBLOCK / 8,
     sizeof(EVP_MD *) + sizeof(WHIRLPOOL_CTX),
 };