0c994d54af
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/9681)
35 lines
1 KiB
C
35 lines
1 KiB
C
/*
|
|
* Copyright 2016-2018 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
|
|
*/
|
|
|
|
#include "internal/cryptlib.h"
|
|
|
|
/* This file is not scanned by mkdef.pl, whereas cryptlib.h is */
|
|
|
|
struct thread_local_inits_st {
|
|
int async;
|
|
int err_state;
|
|
int rand;
|
|
};
|
|
|
|
int ossl_init_thread_start(uint64_t opts);
|
|
|
|
/*
|
|
* OPENSSL_INIT flags. The primary list of these is in crypto.h. Flags below
|
|
* are those omitted from crypto.h because they are "reserved for internal
|
|
* use".
|
|
*/
|
|
# define OPENSSL_INIT_ZLIB 0x00010000L
|
|
# define OPENSSL_INIT_BASE_ONLY 0x00040000L
|
|
|
|
/* OPENSSL_INIT_THREAD flags */
|
|
# define OPENSSL_INIT_THREAD_ASYNC 0x01
|
|
# define OPENSSL_INIT_THREAD_ERR_STATE 0x02
|
|
# define OPENSSL_INIT_THREAD_RAND 0x04
|
|
|
|
void ossl_malloc_setup_failures(void);
|