diff options
| author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 00:45:33 +0200 |
|---|---|---|
| committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 20:26:34 +0200 |
| commit | 25f2138b0ab54a65ba713c093ca3734d88f7cb51 (patch) | |
| tree | 0438d0f46a6a591d5833d74e0ccd9cb5da24fa2b /crypto/store | |
| parent | Add legacy include guard manually to opensslconf.h.in (diff) | |
| download | openssl-25f2138b0ab54a65ba713c093ca3734d88f7cb51.tar.xz openssl-25f2138b0ab54a65ba713c093ca3734d88f7cb51.zip | |
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)
Diffstat (limited to 'crypto/store')
| -rw-r--r-- | crypto/store/loader_file.c | 6 | ||||
| -rw-r--r-- | crypto/store/store_init.c | 2 | ||||
| -rw-r--r-- | crypto/store/store_lib.c | 2 | ||||
| -rw-r--r-- | crypto/store/store_register.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c index 206af12af6..88302e58f3 100644 --- a/crypto/store/loader_file.c +++ b/crypto/store/loader_file.c @@ -24,11 +24,11 @@ #include <openssl/store.h> #include <openssl/ui.h> #include <openssl/x509.h> /* For the PKCS8 stuff o.O */ -#include "internal/asn1_int.h" -#include "internal/ctype.h" +#include "crypto/asn1.h" +#include "crypto/ctype.h" #include "internal/o_dir.h" #include "internal/cryptlib.h" -#include "internal/store_int.h" +#include "crypto/store.h" #include "store_locl.h" #ifdef _WIN32 diff --git a/crypto/store/store_init.c b/crypto/store/store_init.c index db050c07cc..c5d8cc456e 100644 --- a/crypto/store/store_init.c +++ b/crypto/store/store_init.c @@ -8,7 +8,7 @@ */ #include <openssl/err.h> -#include "internal/store.h" +#include "crypto/store.h" #include "store_locl.h" static CRYPTO_ONCE store_init = CRYPTO_ONCE_STATIC_INIT; diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c index 8c55c431c1..2d3b307e04 100644 --- a/crypto/store/store_lib.c +++ b/crypto/store/store_lib.c @@ -18,7 +18,7 @@ #include <openssl/err.h> #include <openssl/store.h> #include "internal/thread_once.h" -#include "internal/store_int.h" +#include "crypto/store.h" #include "store_locl.h" struct ossl_store_ctx_st { diff --git a/crypto/store/store_register.c b/crypto/store/store_register.c index 3022e368c6..8cd57836a9 100644 --- a/crypto/store/store_register.c +++ b/crypto/store/store_register.c @@ -8,7 +8,7 @@ */ #include <string.h> -#include "internal/ctype.h" +#include "crypto/ctype.h" #include <assert.h> #include <openssl/err.h> |