25f2138b0a
Currently, there are two different directories which contain internal header files of libcrypto which are meant to be shared internally: While header files in 'include/internal' are intended to be shared between libcrypto and libssl, the files in 'crypto/include/internal' are intended to be shared inside libcrypto only. To make things complicated, the include search path is set up in such a way that the directive #include "internal/file.h" could refer to a file in either of these two directoroes. This makes it necessary in some cases to add a '_int.h' suffix to some files to resolve this ambiguity: #include "internal/file.h" # located in 'include/internal' #include "internal/file_int.h" # located in 'crypto/include/internal' This commit moves the private crypto headers from 'crypto/include/internal' to 'include/crypto' As a result, the include directives become unambiguous #include "internal/file.h" # located in 'include/internal' #include "crypto/file.h" # located in 'include/crypto' hence the superfluous '_int.h' suffixes can be stripped. The files 'store_int.h' and 'store.h' need to be treated specially; they are joined into a single file. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9333)
51 lines
1.1 KiB
C
51 lines
1.1 KiB
C
/*
|
|
* Copyright 2019 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
|
|
*/
|
|
|
|
#ifndef OPENSSL_NO_BLAKE2
|
|
|
|
# include <stddef.h>
|
|
# include <openssl/obj_mac.h>
|
|
# include "crypto/evp.h"
|
|
# include "internal/blake2.h"
|
|
|
|
static int init(EVP_MD_CTX *ctx)
|
|
{
|
|
return blake2b512_init(EVP_MD_CTX_md_data(ctx));
|
|
}
|
|
|
|
static int update(EVP_MD_CTX *ctx, const void *data, size_t count)
|
|
{
|
|
return blake2b_update(EVP_MD_CTX_md_data(ctx), data, count);
|
|
}
|
|
|
|
static int final(EVP_MD_CTX *ctx, unsigned char *md)
|
|
{
|
|
return blake2b_final(md, EVP_MD_CTX_md_data(ctx));
|
|
}
|
|
|
|
static const EVP_MD blake2b_md = {
|
|
NID_blake2b512,
|
|
0,
|
|
BLAKE2B_DIGEST_LENGTH,
|
|
0,
|
|
init,
|
|
update,
|
|
final,
|
|
NULL,
|
|
NULL,
|
|
BLAKE2B_BLOCKBYTES,
|
|
sizeof(BLAKE2B_CTX),
|
|
};
|
|
|
|
const EVP_MD *EVP_blake2b512(void)
|
|
{
|
|
return &blake2b_md;
|
|
}
|
|
#endif /* OPENSSL_NO_BLAKE2 */
|