Reorganize private crypto header files
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)
This commit is contained in:
parent
ea8e1fe55b
commit
25f2138b0a
329 changed files with 398 additions and 406 deletions
|
@ -15,7 +15,7 @@
|
|||
#include <openssl/crypto.h>
|
||||
#include <internal/nelem.h>
|
||||
|
||||
#include "internal/sparse_array.h"
|
||||
#include "crypto/sparse_array.h"
|
||||
#include "testutil.h"
|
||||
|
||||
/* The macros below generate unused functions which error out one of the clang
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue