diff options
| author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-27 23:57:58 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-27 23:57:58 +0200 |
| commit | 0c994d54afbb734ed744330d4b03a653a8477fe3 (patch) | |
| tree | f88964f69776b04bdbf8b9091459caa21f379d58 /crypto/rand | |
| parent | 61df2198e20ca47a4e8418c5bc47a362fd491ea3 (diff) | |
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/9681)
Diffstat (limited to 'crypto/rand')
| -rw-r--r-- | crypto/rand/drbg_lib.c | 4 | ||||
| -rw-r--r-- | crypto/rand/rand_lib.c | 2 | ||||
| -rw-r--r-- | crypto/rand/rand_unix.c | 2 | ||||
| -rw-r--r-- | crypto/rand/rand_vms.c | 2 | ||||
| -rw-r--r-- | crypto/rand/rand_win.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/crypto/rand/drbg_lib.c b/crypto/rand/drbg_lib.c index 12bb627a04..24fd6b2cbb 100644 --- a/crypto/rand/drbg_lib.c +++ b/crypto/rand/drbg_lib.c @@ -13,8 +13,8 @@ #include <openssl/rand.h> #include "rand_lcl.h" #include "internal/thread_once.h" -#include "internal/rand_int.h" -#include "internal/cryptlib_int.h" +#include "crypto/rand.h" +#include "crypto/cryptlib.h" /* * Support framework for NIST SP 800-90A DRBG diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index 91b2652311..74b31bedcb 100644 --- a/crypto/rand/rand_lib.c +++ b/crypto/rand/rand_lib.c @@ -11,7 +11,7 @@ #include <time.h> #include "internal/cryptlib.h" #include <openssl/opensslconf.h> -#include "internal/rand_int.h" +#include "crypto/rand.h" #include <openssl/engine.h> #include "internal/thread_once.h" #include "rand_lcl.h" diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index 69efcdeed7..1da09107c6 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -16,7 +16,7 @@ #include <openssl/rand.h> #include <openssl/crypto.h> #include "rand_lcl.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #include <stdio.h> #include "internal/dso.h" #ifdef __linux diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c index e1e1c0b9db..63ccc55d8f 100644 --- a/crypto/rand/rand_vms.c +++ b/crypto/rand/rand_vms.c @@ -14,7 +14,7 @@ # include <unistd.h> # include "internal/cryptlib.h" # include <openssl/rand.h> -# include "internal/rand_int.h" +# include "crypto/rand.h" # include "rand_lcl.h" # include <descrip.h> # include <dvidef.h> diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c index a9c5751f1a..5a1f8a7b25 100644 --- a/crypto/rand/rand_win.c +++ b/crypto/rand/rand_win.c @@ -10,7 +10,7 @@ #include "internal/cryptlib.h" #include <openssl/rand.h> #include "rand_lcl.h" -#include "internal/rand_int.h" +#include "crypto/rand.h" #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) # ifndef OPENSSL_RAND_SEED_OS |