projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change EVP_MAC method from copy to dup
[openssl.git]
/
crypto
/
blake2
/
m_blake2s.c
diff --git
a/crypto/blake2/m_blake2s.c
b/crypto/blake2/m_blake2s.c
index 01974d966c6b0fda9fc097863f9b1f8fc5b3d326..dd4b68fa1c2d3589fc143a890c90d4fbc4c3f524 100644
(file)
--- a/
crypto/blake2/m_blake2s.c
+++ b/
crypto/blake2/m_blake2s.c
@@
-1,42
+1,32
@@
/*
/*
- * Copyright 2012, Samuel Neves <sneves@dei.uc.pt>.
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2019 The OpenSSL Project Authors. All Rights Reserved.
*
*
- * Licensed under the
OpenSSL licenses, (the "License");
- *
you may not use this file except in compliance with the License.
- *
You may obtain a copy of the License
at
+ * 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
* https://www.openssl.org/source/license.html
- * or in the file LICENSE in the source distribution.
*/
*/
-/*
- * Derived from the BLAKE2 reference implementation written by Samuel Neves.
- * More information about the BLAKE2 hash function and its implementations
- * can be found at https://blake2.net.
- */
-
-#include "internal/cryptlib.h"
-
#ifndef OPENSSL_NO_BLAKE2
#ifndef OPENSSL_NO_BLAKE2
-# include <openssl/evp.h>
-# include <openssl/objects.h>
-# include "internal/blake2_locl.h"
+# include <stddef.h>
+# include <openssl/obj_mac.h>
# include "internal/evp_int.h"
# include "internal/evp_int.h"
+# include "internal/blake2.h"
static int init(EVP_MD_CTX *ctx)
{
static int init(EVP_MD_CTX *ctx)
{
- return
BLAKE2s_I
nit(EVP_MD_CTX_md_data(ctx));
+ return
blake2s256_i
nit(EVP_MD_CTX_md_data(ctx));
}
static int update(EVP_MD_CTX *ctx, const void *data, size_t count)
{
}
static int update(EVP_MD_CTX *ctx, const void *data, size_t count)
{
- return
BLAKE2s_U
pdate(EVP_MD_CTX_md_data(ctx), data, count);
+ return
blake2s_u
pdate(EVP_MD_CTX_md_data(ctx), data, count);
}
static int final(EVP_MD_CTX *ctx, unsigned char *md)
{
}
static int final(EVP_MD_CTX *ctx, unsigned char *md)
{
- return
BLAKE2s_F
inal(md, EVP_MD_CTX_md_data(ctx));
+ return
blake2s_f
inal(md, EVP_MD_CTX_md_data(ctx));
}
static const EVP_MD blake2s_md = {
}
static const EVP_MD blake2s_md = {
@@
-49,12
+39,12
@@
static const EVP_MD blake2s_md = {
final,
NULL,
NULL,
final,
NULL,
NULL,
-
0
,
- sizeof(
EVP_MD *) + sizeof(
BLAKE2S_CTX),
+
BLAKE2S_BLOCKBYTES
,
+ sizeof(BLAKE2S_CTX),
};
const EVP_MD *EVP_blake2s256(void)
{
};
const EVP_MD *EVP_blake2s256(void)
{
- return
(&blake2s_md)
;
+ return
&blake2s_md
;
}
}
-#endif
+#endif
/* OPENSSL_NO_BLAKE2 */