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 /doc/internal/man3 | |
parent | ea8e1fe55b51d9da69977d8dc3f2ffd648d438df (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/9333)
Diffstat (limited to 'doc/internal/man3')
-rw-r--r-- | doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod | 2 | ||||
-rw-r--r-- | doc/internal/man3/evp_keymgmt_export_to_provider.pod | 2 | ||||
-rw-r--r-- | doc/internal/man3/evp_keymgmt_freekey.pod | 2 | ||||
-rw-r--r-- | doc/internal/man3/ossl_init_thread_deregister.pod | 2 | ||||
-rw-r--r-- | doc/internal/man3/rand_bytes_ex.pod | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod b/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod index 60695266a7..8617c97581 100644 --- a/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod +++ b/doc/internal/man3/DEFINE_SPARSE_ARRAY_OF.pod @@ -11,7 +11,7 @@ ossl_sa_TYPE_doall_arg, ossl_sa_TYPE_get, ossl_sa_TYPE_set =for comment generic - #include "internal/sparse_array.h" + #include "crypto/sparse_array.h" typedef struct sparse_array_st OPENSSL_SA; diff --git a/doc/internal/man3/evp_keymgmt_export_to_provider.pod b/doc/internal/man3/evp_keymgmt_export_to_provider.pod index 72b766fb93..2cb40940b4 100644 --- a/doc/internal/man3/evp_keymgmt_export_to_provider.pod +++ b/doc/internal/man3/evp_keymgmt_export_to_provider.pod @@ -8,7 +8,7 @@ evp_keymgmt_clear_pkey_cache =head1 SYNOPSIS - #include "internal/evp_int.h" + #include "crypto/evp.h" void *evp_keymgmt_export_to_provider(EVP_PKEY *pk, EVP_KEYMGMT *keymgmt); void evp_keymgmt_clear_pkey_cache(EVP_PKEY *pk); diff --git a/doc/internal/man3/evp_keymgmt_freekey.pod b/doc/internal/man3/evp_keymgmt_freekey.pod index 597c34b6d4..8be73aee81 100644 --- a/doc/internal/man3/evp_keymgmt_freekey.pod +++ b/doc/internal/man3/evp_keymgmt_freekey.pod @@ -14,7 +14,7 @@ evp_keymgmt_importkey_types, evp_keymgmt_exportkey_types =head1 SYNOPSIS - #include "internal/evp_int.h" + #include "crypto/evp.h" void *evp_keymgmt_importdomparams(const EVP_KEYMGMT *keymgmt, const OSSL_PARAM params[]); diff --git a/doc/internal/man3/ossl_init_thread_deregister.pod b/doc/internal/man3/ossl_init_thread_deregister.pod index ccfb419731..923b525477 100644 --- a/doc/internal/man3/ossl_init_thread_deregister.pod +++ b/doc/internal/man3/ossl_init_thread_deregister.pod @@ -9,7 +9,7 @@ ossl_init_thread_deregister =head1 SYNOPSIS - #include "internal/cryptlib_int.h" + #include "crypto/cryptlib.h" #include <openssl/core.h> typedef void (*OSSL_thread_stop_handler_fn)(void *arg); diff --git a/doc/internal/man3/rand_bytes_ex.pod b/doc/internal/man3/rand_bytes_ex.pod index cf54e02a31..e1bb0f04df 100644 --- a/doc/internal/man3/rand_bytes_ex.pod +++ b/doc/internal/man3/rand_bytes_ex.pod @@ -7,7 +7,7 @@ rand_bytes_ex, rand_priv_bytes_ex =head1 SYNOPSIS - #include "internal/rand_int.h" + #include "crypto/rand.h" int rand_bytes_ex(OPENSSL_CTX *ctx, unsigned char *buf, int num); int rand_priv_bytes_ex(OPENSSL_CTX *ctx, unsigned char *buf, int num); |