Following the license change, modify the boilerplates in crypto/evp/

[openssl.git] / crypto / evp / m_wp.c

diff --git a/crypto/evp/m_wp.c b/crypto/evp/m_wp.c
index 1ce47c040bcc01fba93c972bfbbfcd467f7324eb..10c07ff55111d22ee6dd4c157cfbd22374decac4 100644 (file)
--- a/crypto/evp/m_wp.c
+++ b/crypto/evp/m_wp.c
@@ -1,42 +1,54 @@
-/* crypto/evp/m_wp.c */
+/*
+ * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (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
+ */

 
 #include <stdio.h>
 
 #include <stdio.h>

-#include "cryptlib.h"
+#include "internal/cryptlib.h"

 
 #ifndef OPENSSL_NO_WHIRLPOOL
 
 
 #ifndef OPENSSL_NO_WHIRLPOOL
 

-#include <openssl/evp.h>
-#include <openssl/objects.h>
-#include <openssl/x509.h>
-#include <openssl/whrlpool.h>
+# include <openssl/evp.h>
+# include <openssl/objects.h>
+# include <openssl/x509.h>
+# include <openssl/whrlpool.h>
+# include "internal/evp_int.h"

 
 static int init(EVP_MD_CTX *ctx)
 
 static int init(EVP_MD_CTX *ctx)

-       { return WHIRLPOOL_Init(ctx->md_data); }
-
-static int update(EVP_MD_CTX *ctx,const void *data,size_t count)
-       { return WHIRLPOOL_Update(ctx->md_data,data,count); }
-
-static int final(EVP_MD_CTX *ctx,unsigned char *md)
-       { return WHIRLPOOL_Final(md,ctx->md_data); }
-
-static const EVP_MD whirlpool_md=
-       {
-       NID_whirlpool,
-       0,
-       WHIRLPOOL_DIGEST_LENGTH,
-       0,
-       init,
-       update,
-       final,
-       NULL,
-       NULL,
-       EVP_PKEY_NULL_method,
-       WHIRLPOOL_BBLOCK/8,
-       sizeof(EVP_MD *)+sizeof(WHIRLPOOL_CTX),
-       };
+{
+    return WHIRLPOOL_Init(EVP_MD_CTX_md_data(ctx));
+}
+
+static int update(EVP_MD_CTX *ctx, const void *data, size_t count)
+{
+    return WHIRLPOOL_Update(EVP_MD_CTX_md_data(ctx), data, count);
+}
+
+static int final(EVP_MD_CTX *ctx, unsigned char *md)
+{
+    return WHIRLPOOL_Final(md, EVP_MD_CTX_md_data(ctx));
+}
+
+static const EVP_MD whirlpool_md = {
+    NID_whirlpool,
+    0,
+    WHIRLPOOL_DIGEST_LENGTH,
+    0,
+    init,
+    update,
+    final,
+    NULL,
+    NULL,
+    WHIRLPOOL_BBLOCK / 8,
+    sizeof(EVP_MD *) + sizeof(WHIRLPOOL_CTX),
+};

 
 const EVP_MD *EVP_whirlpool(void)
 
 const EVP_MD *EVP_whirlpool(void)

-       {
-       return(&whirlpool_md);
-       }
+{
+    return &whirlpool_md;
+}

 #endif
 #endif