diff options
author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 00:45:40 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 20:26:35 +0200 |
commit | 706457b7bda7fdbab426b8dce83b318908339da4 (patch) | |
tree | 0df00f68b06fdeeef553c353a44e25e3d979b2f2 /crypto/engine | |
parent | Reorganize private crypto header files (diff) | |
download | openssl-706457b7bda7fdbab426b8dce83b318908339da4.tar.xz openssl-706457b7bda7fdbab426b8dce83b318908339da4.zip |
Reorganize local header files
Apart from public and internal header files, there is a third type called
local header files, which are located next to source files in the source
directory. Currently, they have different suffixes like
'*_lcl.h', '*_local.h', or '*_int.h'
This commit changes the different suffixes to '*_local.h' uniformly.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9333)
Diffstat (limited to 'crypto/engine')
-rw-r--r-- | crypto/engine/README | 2 | ||||
-rw-r--r-- | crypto/engine/eng_all.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_cnf.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_ctrl.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_dyn.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_fat.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_init.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_lib.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_list.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_local.h (renamed from crypto/engine/eng_int.h) | 0 | ||||
-rw-r--r-- | crypto/engine/eng_pkey.c | 2 | ||||
-rw-r--r-- | crypto/engine/eng_table.c | 6 | ||||
-rw-r--r-- | crypto/engine/tb_asnmth.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_cipher.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_dh.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_digest.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_dsa.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_eckey.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_pkmeth.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_rand.c | 2 | ||||
-rw-r--r-- | crypto/engine/tb_rsa.c | 2 |
21 files changed, 22 insertions, 22 deletions
diff --git a/crypto/engine/README b/crypto/engine/README index c7a5696ca1..0f8a8fbde4 100644 --- a/crypto/engine/README +++ b/crypto/engine/README @@ -9,7 +9,7 @@ for masochists" document *and* a rather extensive commit log message. (I'd get lynched for sticking all this in CHANGES or the commit mails :-). ENGINE_TABLE underlies this restructuring, as described in the internal header -"eng_int.h", implemented in eng_table.c, and used in each of the "class" files; +"eng_local.h", implemented in eng_table.c, and used in each of the "class" files; tb_rsa.c, tb_dsa.c, etc. However, "EVP_CIPHER" underlies the motivation and design of ENGINE_TABLE so diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c index e1f09acddf..0c5e4bdfd5 100644 --- a/crypto/engine/eng_all.c +++ b/crypto/engine/eng_all.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "eng_int.h" +#include "eng_local.h" void ENGINE_load_builtin_engines(void) { diff --git a/crypto/engine/eng_cnf.c b/crypto/engine/eng_cnf.c index 9f647c4a9a..221981942c 100644 --- a/crypto/engine/eng_cnf.c +++ b/crypto/engine/eng_cnf.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" #include <openssl/conf.h> #include <openssl/trace.h> diff --git a/crypto/engine/eng_ctrl.c b/crypto/engine/eng_ctrl.c index d036f80e3b..39cfb17089 100644 --- a/crypto/engine/eng_ctrl.c +++ b/crypto/engine/eng_ctrl.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" /* * When querying a ENGINE-specific control command's 'description', this diff --git a/crypto/engine/eng_dyn.c b/crypto/engine/eng_dyn.c index bde760253a..7b1bc6ed84 100644 --- a/crypto/engine/eng_dyn.c +++ b/crypto/engine/eng_dyn.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" #include "internal/dso.h" #include <openssl/crypto.h> diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c index e6938a41ce..428e66733b 100644 --- a/crypto/engine/eng_fat.c +++ b/crypto/engine/eng_fat.c @@ -8,7 +8,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" #include <openssl/conf.h> int ENGINE_set_default(ENGINE *e, unsigned int flags) diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c index 6d74a2ddb1..34f01388a2 100644 --- a/crypto/engine/eng_init.c +++ b/crypto/engine/eng_init.c @@ -8,7 +8,7 @@ */ #include "e_os.h" -#include "eng_int.h" +#include "eng_local.h" /* * Initialise a engine type for use (or up its functional reference count if diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c index be893fe5bf..4ba235ca75 100644 --- a/crypto/engine/eng_lib.c +++ b/crypto/engine/eng_lib.c @@ -8,7 +8,7 @@ */ #include "e_os.h" -#include "eng_int.h" +#include "eng_local.h" #include <openssl/rand.h> #include "internal/refcount.h" diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c index a0c56c506e..7659231e56 100644 --- a/crypto/engine/eng_list.c +++ b/crypto/engine/eng_list.c @@ -8,7 +8,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" /* * The linked-list of pointers to engine types. engine_list_head incorporates diff --git a/crypto/engine/eng_int.h b/crypto/engine/eng_local.h index 4600531843..4600531843 100644 --- a/crypto/engine/eng_int.h +++ b/crypto/engine/eng_local.h diff --git a/crypto/engine/eng_pkey.c b/crypto/engine/eng_pkey.c index 7282d5ddbf..1f67eaa4fc 100644 --- a/crypto/engine/eng_pkey.c +++ b/crypto/engine/eng_pkey.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" /* Basic get/set stuff */ diff --git a/crypto/engine/eng_table.c b/crypto/engine/eng_table.c index 62e9416869..f6dfad9867 100644 --- a/crypto/engine/eng_table.c +++ b/crypto/engine/eng_table.c @@ -11,7 +11,7 @@ #include <openssl/evp.h> #include <openssl/lhash.h> #include <openssl/trace.h> -#include "eng_int.h" +#include "eng_local.h" /* The type of the items in the table */ struct st_engine_pile { @@ -27,7 +27,7 @@ struct st_engine_pile { int uptodate; }; -/* The type exposed in eng_int.h */ +/* The type exposed in eng_local.h */ struct st_engine_table { LHASH_OF(ENGINE_PILE) piles; }; /* ENGINE_TABLE */ @@ -77,7 +77,7 @@ static int int_table_check(ENGINE_TABLE **t, int create) } /* - * Privately exposed (via eng_int.h) functions for adding and/or removing + * Privately exposed (via eng_local.h) functions for adding and/or removing * ENGINEs from the implementation table */ int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup, diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c index 2e01deb901..5e356312a0 100644 --- a/crypto/engine/tb_asnmth.c +++ b/crypto/engine/tb_asnmth.c @@ -8,7 +8,7 @@ */ #include "e_os.h" -#include "eng_int.h" +#include "eng_local.h" #include <openssl/evp.h> #include "crypto/asn1.h" diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c index 8aa3be7e48..c669907a53 100644 --- a/crypto/engine/tb_cipher.c +++ b/crypto/engine/tb_cipher.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" static ENGINE_TABLE *cipher_table = NULL; diff --git a/crypto/engine/tb_dh.c b/crypto/engine/tb_dh.c index 5e2824ae95..e877fce2fc 100644 --- a/crypto/engine/tb_dh.c +++ b/crypto/engine/tb_dh.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" static ENGINE_TABLE *dh_table = NULL; static const int dummy_nid = 1; diff --git a/crypto/engine/tb_digest.c b/crypto/engine/tb_digest.c index 4221f6d898..8a5a8332a9 100644 --- a/crypto/engine/tb_digest.c +++ b/crypto/engine/tb_digest.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" static ENGINE_TABLE *digest_table = NULL; diff --git a/crypto/engine/tb_dsa.c b/crypto/engine/tb_dsa.c index 15492d56b8..a22e8f6941 100644 --- a/crypto/engine/tb_dsa.c +++ b/crypto/engine/tb_dsa.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" static ENGINE_TABLE *dsa_table = NULL; static const int dummy_nid = 1; diff --git a/crypto/engine/tb_eckey.c b/crypto/engine/tb_eckey.c index 8c662e7ebb..397dad8855 100644 --- a/crypto/engine/tb_eckey.c +++ b/crypto/engine/tb_eckey.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" static ENGINE_TABLE *dh_table = NULL; static const int dummy_nid = 1; diff --git a/crypto/engine/tb_pkmeth.c b/crypto/engine/tb_pkmeth.c index 4dab5d5933..beb4fd7371 100644 --- a/crypto/engine/tb_pkmeth.c +++ b/crypto/engine/tb_pkmeth.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" #include <openssl/evp.h> static ENGINE_TABLE *pkey_meth_table = NULL; diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c index 3b1b475163..d7c7ef485f 100644 --- a/crypto/engine/tb_rand.c +++ b/crypto/engine/tb_rand.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" static ENGINE_TABLE *rand_table = NULL; static const int dummy_nid = 1; diff --git a/crypto/engine/tb_rsa.c b/crypto/engine/tb_rsa.c index 02c309a3bb..5b7d6717ae 100644 --- a/crypto/engine/tb_rsa.c +++ b/crypto/engine/tb_rsa.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "eng_int.h" +#include "eng_local.h" static ENGINE_TABLE *rsa_table = NULL; static const int dummy_nid = 1; |