diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 3c4299d2640488f47abc1abec930cac6570454e9..97be7b95a9bb688b134d244b7b929601b9e13cec 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -434,7 +434,7 @@ my %targets = ( # 32-bit message digests. (For the moment of this writing) HP C # doesn't seem to "digest" too many local variables (they make "him" # chew forever:-). For more details look-up MD32_XARRAY comment in -# crypto/sha/sha_lcl.h. +# crypto/sha/sha_local.h. # - originally there were 32-bit hpux-parisc2-* targets. They were # scrapped, because a) they were not interchangeable with other 32-bit # targets; b) performance-critical 32-bit assembly modules implement diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c index f1f11fd8de7bf5f9bcacb3c5ba7fa13da65dfd15..e3e688f528a5d536f193f9d8b779bc7b039b5c92 100644 --- a/crypto/aes/aes_core.c +++ b/crypto/aes/aes_core.c @@ -41,7 +41,7 @@ #include #include #include -#include "aes_locl.h" +#include "aes_local.h" #ifndef AES_ASM /*- diff --git a/crypto/aes/aes_ecb.c b/crypto/aes/aes_ecb.c index 29bfc1ad66f7a26f26387efd7f0322ce34707b82..4fa360ca8b8d72154eb881d96d8e572a9e68ee49 100644 --- a/crypto/aes/aes_ecb.c +++ b/crypto/aes/aes_ecb.c @@ -10,7 +10,7 @@ #include #include -#include "aes_locl.h" +#include "aes_local.h" void AES_ecb_encrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key, const int enc) diff --git a/crypto/aes/aes_ige.c b/crypto/aes/aes_ige.c index 75f796cf3b8fba6cd1675ca717f6c6c8cd2d68b6..dce4ef11be4f727048d7f23ebb34335d9340145f 100644 --- a/crypto/aes/aes_ige.c +++ b/crypto/aes/aes_ige.c @@ -10,7 +10,7 @@ #include "internal/cryptlib.h" #include -#include "aes_locl.h" +#include "aes_local.h" #define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long)) typedef struct { diff --git a/crypto/aes/aes_locl.h b/crypto/aes/aes_local.h similarity index 100% rename from crypto/aes/aes_locl.h rename to crypto/aes/aes_local.h diff --git a/crypto/aes/aes_misc.c b/crypto/aes/aes_misc.c index 7403c84f82d243b4be5630c8a5125e5458d56b0e..e0edc72ba71cc80c01daa9e82cce05680d6ae3a5 100644 --- a/crypto/aes/aes_misc.c +++ b/crypto/aes/aes_misc.c @@ -9,7 +9,7 @@ #include #include -#include "aes_locl.h" +#include "aes_local.h" const char *AES_options(void) { diff --git a/crypto/aes/aes_x86core.c b/crypto/aes/aes_x86core.c index 1b660d716d6c18baa13b5f7a2d114b95d583ce26..50b53abc12195f6ab56fe7de7b20751eb9c07dbf 100644 --- a/crypto/aes/aes_x86core.c +++ b/crypto/aes/aes_x86core.c @@ -46,7 +46,7 @@ #include #include -#include "aes_locl.h" +#include "aes_local.h" /* * These two parameters control which table, 256-byte or 2KB, is diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c index bffbd160a233ee83061f264a2fb64665150f3d77..f462dd107368caa4ff90ea4318653072fb65ce47 100644 --- a/crypto/asn1/a_bitstr.c +++ b/crypto/asn1/a_bitstr.c @@ -11,7 +11,7 @@ #include #include "internal/cryptlib.h" #include -#include "asn1_locl.h" +#include "asn1_local.h" int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len) { diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c index d3878d6e57fe4731d083747a024f8acd0cb9fbf7..133bbb1581cb6dc9d630b9e910c750ff3cb220e6 100644 --- a/crypto/asn1/a_gentm.c +++ b/crypto/asn1/a_gentm.c @@ -15,7 +15,7 @@ #include #include "internal/cryptlib.h" #include -#include "asn1_locl.h" +#include "asn1_local.h" /* This is the primary function used to parse ASN1_GENERALIZEDTIME */ int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d) diff --git a/crypto/asn1/a_int.c b/crypto/asn1/a_int.c index 70a45cb3cc770de2f30254fecd0dc6d887f29401..9c1a9f52b5e67dfa23ffeb308562a3722b931c85 100644 --- a/crypto/asn1/a_int.c +++ b/crypto/asn1/a_int.c @@ -13,7 +13,7 @@ #include #include #include -#include "asn1_locl.h" +#include "asn1_local.h" ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x) { diff --git a/crypto/asn1/a_object.c b/crypto/asn1/a_object.c index 064835b7ecdeac36fe376100e8eb1a2daa4e64b1..d67a723c961160913e7740a9180ac4cf82b2e9f5 100644 --- a/crypto/asn1/a_object.c +++ b/crypto/asn1/a_object.c @@ -16,7 +16,7 @@ #include #include #include "crypto/asn1.h" -#include "asn1_locl.h" +#include "asn1_local.h" int i2d_ASN1_OBJECT(const ASN1_OBJECT *a, unsigned char **pp) { diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index bbb07fd6d81cadf1bc1cf1e53aefeaef7a96b440..54e0de1931c2343e98200122a03a6da312fb9e39 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -19,7 +19,7 @@ #include "crypto/ctype.h" #include "internal/cryptlib.h" #include -#include "asn1_locl.h" +#include "asn1_local.h" IMPLEMENT_ASN1_MSTRING(ASN1_TIME, B_ASN1_TIME) diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c index 732328e050498caff748fa25bdb73af41ebdaada..4a96315df03b935a7a0f9d0cc273fad6bafc88e8 100644 --- a/crypto/asn1/a_type.c +++ b/crypto/asn1/a_type.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include #include -#include "asn1_locl.h" +#include "asn1_local.h" int ASN1_TYPE_get(const ASN1_TYPE *a) { diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c index b224991aa3df1ee06e3d5e53ce5a9dfd25c75a18..0ff37b16c51fb7cadf9d5760b59e2272b02cde6d 100644 --- a/crypto/asn1/a_utctm.c +++ b/crypto/asn1/a_utctm.c @@ -11,7 +11,7 @@ #include #include "internal/cryptlib.h" #include -#include "asn1_locl.h" +#include "asn1_local.h" /* This is the primary function used to parse ASN1_UTCTIME */ int asn1_utctime_to_tm(struct tm *tm, const ASN1_UTCTIME *d) diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index 88c4b539180267b6bccedd4a8b17d416e61d583f..a7d32ae5e2c3cf480b1c23360a83798d491847fb 100644 --- a/crypto/asn1/asn1_lib.c +++ b/crypto/asn1/asn1_lib.c @@ -11,7 +11,7 @@ #include #include "internal/cryptlib.h" #include -#include "asn1_locl.h" +#include "asn1_local.h" static int asn1_get_length(const unsigned char **pp, int *inf, long *rl, long max); diff --git a/crypto/asn1/asn1_locl.h b/crypto/asn1/asn1_local.h similarity index 100% rename from crypto/asn1/asn1_locl.h rename to crypto/asn1/asn1_local.h diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c index c7f05f24e29dcd44a9cc0dee4b89367262e87182..b8ea51136a74f2f97f3ebc5e8f9de89bd4593a68 100644 --- a/crypto/asn1/asn_mime.c +++ b/crypto/asn1/asn_mime.c @@ -16,7 +16,7 @@ #include #include "crypto/evp.h" #include "internal/bio.h" -#include "asn1_locl.h" +#include "asn1_local.h" /* * Generalised MIME like utilities for streaming ASN1. Although many have a diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c index c2a521ed51800bfc1f8243e3b3e896c9111d0fcc..2332b204edc1ca65759cc2832c283cb13d776f3c 100644 --- a/crypto/asn1/tasn_dec.c +++ b/crypto/asn1/tasn_dec.c @@ -15,7 +15,7 @@ #include #include #include "internal/numbers.h" -#include "asn1_locl.h" +#include "asn1_local.h" /* diff --git a/crypto/asn1/tasn_enc.c b/crypto/asn1/tasn_enc.c index 0d32f4d97968569d191d952950e9d6b0593ccebe..d600c7a538041ecf58d2b47f73fa25a418d4c401 100644 --- a/crypto/asn1/tasn_enc.c +++ b/crypto/asn1/tasn_enc.c @@ -14,7 +14,7 @@ #include #include #include "crypto/asn1.h" -#include "asn1_locl.h" +#include "asn1_local.h" static int asn1_i2d_ex_primitive(ASN1_VALUE **pval, unsigned char **out, const ASN1_ITEM *it, int tag, int aclass); diff --git a/crypto/asn1/tasn_fre.c b/crypto/asn1/tasn_fre.c index bbce489fe0036d1aadbdd74beb730296083e7c37..2916bef7863af05aae98ffd482b6d79f3ffe0587 100644 --- a/crypto/asn1/tasn_fre.c +++ b/crypto/asn1/tasn_fre.c @@ -11,7 +11,7 @@ #include #include #include -#include "asn1_locl.h" +#include "asn1_local.h" /* Free up an ASN1 structure */ diff --git a/crypto/asn1/tasn_new.c b/crypto/asn1/tasn_new.c index 6b8ea8ddd74dbe0138e35cc942ec4b515099b164..287f2af33b583b028e411b8620a53cfb081626a7 100644 --- a/crypto/asn1/tasn_new.c +++ b/crypto/asn1/tasn_new.c @@ -13,7 +13,7 @@ #include #include #include -#include "asn1_locl.h" +#include "asn1_local.h" static int asn1_item_embed_new(ASN1_VALUE **pval, const ASN1_ITEM *it, int embed); diff --git a/crypto/asn1/tasn_prn.c b/crypto/asn1/tasn_prn.c index dc0876508bf634552f70b88bb0b3268b86d4eb58..56d5ea0f39e376759cfa1581658763b2f235f542 100644 --- a/crypto/asn1/tasn_prn.c +++ b/crypto/asn1/tasn_prn.c @@ -16,7 +16,7 @@ #include #include #include "crypto/asn1.h" -#include "asn1_locl.h" +#include "asn1_local.h" /* * Print routines. diff --git a/crypto/asn1/tasn_scn.c b/crypto/asn1/tasn_scn.c index e1df2cfcae042d740909205040e83c0c80707d5c..f0f218ae8bbe07ad14a19bbd9c930546ebbe0be8 100644 --- a/crypto/asn1/tasn_scn.c +++ b/crypto/asn1/tasn_scn.c @@ -15,7 +15,7 @@ #include #include #include -#include "asn1_locl.h" +#include "asn1_local.h" /* * General ASN1 structure recursive scanner: iterate through all fields diff --git a/crypto/asn1/tasn_utl.c b/crypto/asn1/tasn_utl.c index 7ceecffce75822ed7d428beb75a3030750b63031..a448685e19a9bb424fd7131305a2693e0f15e6af 100644 --- a/crypto/asn1/tasn_utl.c +++ b/crypto/asn1/tasn_utl.c @@ -15,7 +15,7 @@ #include #include #include -#include "asn1_locl.h" +#include "asn1_local.h" /* Utility functions for manipulating fields and offsets */ diff --git a/crypto/asn1/x_int64.c b/crypto/asn1/x_int64.c index 0ee552cf0a4885b418b67be79e98a7af216b17c8..96c1a259e1fe4feba2c2ba7ff677c94b77690627 100644 --- a/crypto/asn1/x_int64.c +++ b/crypto/asn1/x_int64.c @@ -12,7 +12,7 @@ #include "internal/numbers.h" #include #include -#include "asn1_locl.h" +#include "asn1_local.h" /* * Custom primitive types for handling int32_t, int64_t, uint32_t, uint64_t. diff --git a/crypto/async/arch/async_null.c b/crypto/async/arch/async_null.c index 3eaf170f2e50770b67aef92c00c33f24409f714e..26801f8731307c2fa5bf69e5e51dea8730d25407 100644 --- a/crypto/async/arch/async_null.c +++ b/crypto/async/arch/async_null.c @@ -8,7 +8,7 @@ */ /* This must be the first #include file */ -#include "../async_locl.h" +#include "../async_local.h" #ifdef ASYNC_NULL int ASYNC_is_capable(void) diff --git a/crypto/async/arch/async_posix.c b/crypto/async/arch/async_posix.c index 02c342d3dfa93b7d976c14c7f6643037a84ce585..95678d4fa686accf80b3d5b5e4b537c719de9648 100644 --- a/crypto/async/arch/async_posix.c +++ b/crypto/async/arch/async_posix.c @@ -8,7 +8,7 @@ */ /* This must be the first #include file */ -#include "../async_locl.h" +#include "../async_local.h" #ifdef ASYNC_POSIX diff --git a/crypto/async/arch/async_win.c b/crypto/async/arch/async_win.c index 077d56ced021f5283b3c98d228ef66228ce6c2b5..1f360d895b01a4015a46adfc68d325359f17cdb2 100644 --- a/crypto/async/arch/async_win.c +++ b/crypto/async/arch/async_win.c @@ -8,7 +8,7 @@ */ /* This must be the first #include file */ -#include "../async_locl.h" +#include "../async_local.h" #ifdef ASYNC_WIN diff --git a/crypto/async/async.c b/crypto/async/async.c index fba15e83e8e7b66a8c5d2e3febda73da307ae085..326015c605e96020f30a3bd464a359a0d0f5d61f 100644 --- a/crypto/async/async.c +++ b/crypto/async/async.c @@ -16,7 +16,7 @@ #undef _FORTIFY_SOURCE /* This must be the first #include file */ -#include "async_locl.h" +#include "async_local.h" #include #include "crypto/cryptlib.h" diff --git a/crypto/async/async_locl.h b/crypto/async/async_local.h similarity index 100% rename from crypto/async/async_locl.h rename to crypto/async/async_local.h diff --git a/crypto/async/async_wait.c b/crypto/async/async_wait.c index b23e43e8c8624aa5a40df5bf9937dcfdef62d48f..7723f949a67eb23386ae1ec7b1cb43e20ab88203 100644 --- a/crypto/async/async_wait.c +++ b/crypto/async/async_wait.c @@ -8,7 +8,7 @@ */ /* This must be the first #include file */ -#include "async_locl.h" +#include "async_local.h" #include diff --git a/crypto/bf/bf_cfb64.c b/crypto/bf/bf_cfb64.c index ce6e13b5a4cc369f07b62bb8f133651d90e1c615..12332c540d666fd336539f8a9c54c70a23f76bfe 100644 --- a/crypto/bf/bf_cfb64.c +++ b/crypto/bf/bf_cfb64.c @@ -8,7 +8,7 @@ */ #include -#include "bf_locl.h" +#include "bf_local.h" /* * The input and output encrypted as though 64bit cfb mode is being used. diff --git a/crypto/bf/bf_ecb.c b/crypto/bf/bf_ecb.c index dc1becdbe4ed054caba2f84cdd95210ae590ebed..38e784cc2dad7a7671fa311a95b8e51b237ea29c 100644 --- a/crypto/bf/bf_ecb.c +++ b/crypto/bf/bf_ecb.c @@ -8,7 +8,7 @@ */ #include -#include "bf_locl.h" +#include "bf_local.h" #include /* diff --git a/crypto/bf/bf_enc.c b/crypto/bf/bf_enc.c index 67c0d78aec5cba4cb2ca1ab9476e2cb8d5fcd6f7..423a4697a51e099a6fb9a620a040f6d65378e9df 100644 --- a/crypto/bf/bf_enc.c +++ b/crypto/bf/bf_enc.c @@ -8,7 +8,7 @@ */ #include -#include "bf_locl.h" +#include "bf_local.h" /* * Blowfish as implemented from 'Blowfish: Springer-Verlag paper' (From diff --git a/crypto/bf/bf_locl.h b/crypto/bf/bf_local.h similarity index 100% rename from crypto/bf/bf_locl.h rename to crypto/bf/bf_local.h diff --git a/crypto/bf/bf_ofb64.c b/crypto/bf/bf_ofb64.c index 6418217b307d6443c559106a5ab1911059f2fd28..5d75401fcca5da0fd9c2a24986896c63db42d9c2 100644 --- a/crypto/bf/bf_ofb64.c +++ b/crypto/bf/bf_ofb64.c @@ -8,7 +8,7 @@ */ #include -#include "bf_locl.h" +#include "bf_local.h" /* * The input and output encrypted as though 64bit ofb mode is being used. diff --git a/crypto/bf/bf_skey.c b/crypto/bf/bf_skey.c index a4903a2a71de58a6643693d69c4642b44eba0fb1..ed29cf9153a4b05245f194b933392a826e217891 100644 --- a/crypto/bf/bf_skey.c +++ b/crypto/bf/bf_skey.c @@ -10,7 +10,7 @@ #include #include #include -#include "bf_locl.h" +#include "bf_local.h" #include "bf_pi.h" void BF_set_key(BF_KEY *key, int len, const unsigned char *data) diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c index dd5008e636a47746a1f2a17ca9303cc54c49e1e0..5b9a485a80383bbf9546eb2cb92d0699861a78b2 100644 --- a/crypto/bio/b_addr.c +++ b/crypto/bio/b_addr.c @@ -10,7 +10,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include #ifndef OPENSSL_NO_SOCK @@ -22,7 +22,7 @@ CRYPTO_RWLOCK *bio_lookup_lock; static CRYPTO_ONCE bio_lookup_init = CRYPTO_ONCE_STATIC_INIT; /* - * Throughout this file and bio_lcl.h, the existence of the macro + * Throughout this file and bio_local.h, the existence of the macro * AI_PASSIVE is used to detect the availability of struct addrinfo, * getnameinfo() and getaddrinfo(). If that macro doesn't exist, * we use our own implementation instead, using gethostbyname, @@ -694,7 +694,7 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, hints.ai_flags |= AI_PASSIVE; /* Note that |res| SHOULD be a 'struct addrinfo **' thanks to - * macro magic in bio_lcl.h + * macro magic in bio_local.h */ retry: switch ((gai_ret = getaddrinfo(host, service, &hints, res))) { diff --git a/crypto/bio/b_dump.c b/crypto/bio/b_dump.c index 45f1c523ce5ba5bc42216c27d7a4c813e12cb196..f175e244b23308a216f995e01cfa4425a06a8b8a 100644 --- a/crypto/bio/b_dump.c +++ b/crypto/bio/b_dump.c @@ -12,7 +12,7 @@ */ #include -#include "bio_lcl.h" +#include "bio_local.h" #define DUMP_WIDTH 16 #define DUMP_WIDTH_LESS_INDENT(i) (DUMP_WIDTH - ((i - (i > 6 ? 6 : i) + 3) / 4)) diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index e7a24d02cbe5b0a773bf1c415761f59676fd139b..df431e6d523d47b89ed16969f134f385596d38c3 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -10,7 +10,7 @@ #include #include #include -#include "bio_lcl.h" +#include "bio_local.h" #ifndef OPENSSL_NO_SOCK # define SOCKET_PROTOCOL IPPROTO_TCP # ifdef SO_MAXCONN diff --git a/crypto/bio/b_sock2.c b/crypto/bio/b_sock2.c index 5d82ab22dc304c337d70140f849d4a0f253a5eb6..335dfabc6180dbfd5a1f1111704b94456a7a05c8 100644 --- a/crypto/bio/b_sock2.c +++ b/crypto/bio/b_sock2.c @@ -11,7 +11,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c index 8e87a629b8b5422ee6a8de2975199e3208034057..51ae1f918d87704b09a790a351c830ced1dff0a4 100644 --- a/crypto/bio/bf_buff.c +++ b/crypto/bio/bf_buff.c @@ -9,7 +9,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/cryptlib.h" static int buffer_write(BIO *h, const char *buf, int num); diff --git a/crypto/bio/bf_lbuf.c b/crypto/bio/bf_lbuf.c index 194c7b8af7137fe745a81831d15e96a706587ffd..72f9901813ea756dd7336ce1b525a943948b50fc 100644 --- a/crypto/bio/bf_lbuf.c +++ b/crypto/bio/bf_lbuf.c @@ -9,7 +9,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/cryptlib.h" #include diff --git a/crypto/bio/bf_nbio.c b/crypto/bio/bf_nbio.c index 4bc84eeba659c418d10cc1442883d34315f1fd54..dd7011ab669f04dbc6e4385406405956e86bafa3 100644 --- a/crypto/bio/bf_nbio.c +++ b/crypto/bio/bf_nbio.c @@ -9,7 +9,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/cryptlib.h" #include diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c index 613fb2e0583dd1524b1bc8c55cfe678221a41559..48c6be692a5d4d03a54f4461d02ed5be0a061b5c 100644 --- a/crypto/bio/bf_null.c +++ b/crypto/bio/bf_null.c @@ -9,7 +9,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/cryptlib.h" /* diff --git a/crypto/bio/bio_cb.c b/crypto/bio/bio_cb.c index 1154c233afd8d3e7fadd3e21ccdcb0dacff1a904..a153100a882543007940119b098e29634e4c5aeb 100644 --- a/crypto/bio/bio_cb.c +++ b/crypto/bio/bio_cb.c @@ -10,7 +10,7 @@ #include #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/cryptlib.h" #include diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c index ca375b911ae8b510b39c0456f90b897a3aff6756..d2202e537b30a98d3b9a9651ab5aea56738daea6 100644 --- a/crypto/bio/bio_lib.c +++ b/crypto/bio/bio_lib.c @@ -10,7 +10,7 @@ #include #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/cryptlib.h" diff --git a/crypto/bio/bio_lcl.h b/crypto/bio/bio_local.h similarity index 98% rename from crypto/bio/bio_lcl.h rename to crypto/bio/bio_local.h index e2c05a20de6cbc9e750a44d92ff6599b74d5118d..2ec1ef51cdeef7e978589ffd2fae3ad70d276604 100644 --- a/crypto/bio/bio_lcl.h +++ b/crypto/bio/bio_local.h @@ -28,10 +28,10 @@ * that also includes bio.h. */ # ifdef HEADER_CRYPTLIB_H -# error internal/cryptlib.h included before bio_lcl.h +# error internal/cryptlib.h included before bio_local.h # endif # ifdef HEADER_BIO_H -# error openssl/bio.h included before bio_lcl.h +# error openssl/bio.h included before bio_local.h # endif /* diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c index 493ff63a9012b626b639ff662f0cfd4272e9fa80..da116461922eb5f48214e5fe97654c6d6ccef99d 100644 --- a/crypto/bio/bio_meth.c +++ b/crypto/bio/bio_meth.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/thread_once.h" CRYPTO_RWLOCK *bio_type_lock = NULL; diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c index 993e5903a04faca426934273d2928902bfa75c34..c6a2c388914bb2ef387fb8692a800af013dd054a 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -9,7 +9,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #ifndef OPENSSL_NO_SOCK diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c index e34382c5578141496b4e02d322400b59f0b0d080..c97349e43282597a9260b0fb64bc7fd2a46c6db7 100644 --- a/crypto/bio/bss_bio.c +++ b/crypto/bio/bss_bio.c @@ -21,7 +21,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include #include diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index e9673fe783369308316b07231c232f052dade344..264e25a1c2bae13db035f7cd01a1c76ea639c948 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -10,7 +10,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #ifndef OPENSSL_NO_SOCK diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index 551821609f7313bf3c462b0784fb88f6fd38c2eb..942fd8b514be336c168d47457f9e03b9ef56b368 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -10,7 +10,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #ifndef OPENSSL_NO_DGRAM # ifndef OPENSSL_NO_SCTP diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c index 5bc539c90b961fb89cd7084f4ba9b3fe1e761c04..894b3ff9e7230cae3d0207fb4c270cb3fac00367 100644 --- a/crypto/bio/bss_fd.c +++ b/crypto/bio/bss_fd.c @@ -10,7 +10,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #if defined(OPENSSL_NO_POSIX_IO) /* diff --git a/crypto/bio/bss_file.c b/crypto/bio/bss_file.c index a210205597601231cc1fe97343ef8d114d528cac..1a70ce7994049914dccbf88a30793160d2498125 100644 --- a/crypto/bio/bss_file.c +++ b/crypto/bio/bss_file.c @@ -27,7 +27,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include #if !defined(OPENSSL_NO_STDIO) diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index e9ab932ec29531e87a7175cb9126fc0c847dbd3e..b9579faaa2a57203e783b3fad7a312f4f4cce475 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -19,7 +19,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/cryptlib.h" #if defined(OPENSSL_SYS_WINCE) diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index 2d536e9db05f4cfd4560d3d3f0825daf066a7c85..7cb4a57813fdcfc3b10b45eacd651795c47f1be4 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -9,7 +9,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/cryptlib.h" static int mem_write(BIO *h, const char *buf, int num); diff --git a/crypto/bio/bss_null.c b/crypto/bio/bss_null.c index 08f1d2bc98a37d35c64dc9c0e2ecb937e2b8c507..e73ce7841d41397a3606949aecb95fab935276ff 100644 --- a/crypto/bio/bss_null.c +++ b/crypto/bio/bss_null.c @@ -9,7 +9,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/cryptlib.h" static int null_write(BIO *h, const char *buf, int num); diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c index ad38453201f17114645ebda814c593ce43f40d2a..da818ca90e813cf6737395eecc709dc0c124c997 100644 --- a/crypto/bio/bss_sock.c +++ b/crypto/bio/bss_sock.c @@ -9,7 +9,7 @@ #include #include -#include "bio_lcl.h" +#include "bio_local.h" #include "internal/cryptlib.h" #ifndef OPENSSL_NO_SOCK diff --git a/crypto/blake2/blake2_locl.h b/crypto/blake2/blake2_local.h similarity index 100% rename from crypto/blake2/blake2_locl.h rename to crypto/blake2/blake2_local.h diff --git a/crypto/blake2/blake2b.c b/crypto/blake2/blake2b.c index 4b353dd498bb0cd41509380ad1ab10ab399a1697..fc6e5f1a3f3cc10088789dfddb286858bcd041ae 100644 --- a/crypto/blake2/blake2b.c +++ b/crypto/blake2/blake2b.c @@ -18,7 +18,7 @@ #include #include -#include "blake2_locl.h" +#include "blake2_local.h" #include "blake2_impl.h" static const uint64_t blake2b_IV[8] = diff --git a/crypto/blake2/blake2s.c b/crypto/blake2/blake2s.c index 8211374d123f1275e36cc8025cfb5b9b36fbe953..d072e05ca364391bb4e40417a0b46b6a7a1e4061 100644 --- a/crypto/blake2/blake2s.c +++ b/crypto/blake2/blake2s.c @@ -18,7 +18,7 @@ #include #include -#include "blake2_locl.h" +#include "blake2_local.h" #include "blake2_impl.h" static const uint32_t blake2s_IV[8] = diff --git a/crypto/blake2/m_blake2b.c b/crypto/blake2/m_blake2b.c index 93ed70ce7fca0c4a9dcf66bf3932725937b492cd..ce4d8f95652f4c094e2dd66bb889061b72728f20 100644 --- a/crypto/blake2/m_blake2b.c +++ b/crypto/blake2/m_blake2b.c @@ -20,7 +20,7 @@ # include # include -# include "blake2_locl.h" +# include "blake2_local.h" # include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/blake2/m_blake2s.c b/crypto/blake2/m_blake2s.c index 271068692c0596125e5283e9a63468df49c885ad..b8fb048b30bf9f1c5ce1792af2270e8c613fb9eb 100644 --- a/crypto/blake2/m_blake2s.c +++ b/crypto/blake2/m_blake2s.c @@ -20,7 +20,7 @@ # include # include -# include "blake2_locl.h" +# include "blake2_local.h" # include "crypto/evp.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/bn/README.pod b/crypto/bn/README.pod index 706a140342cd69f6f0eec64769bac712bab97f18..5d5c4fa99fa109eceab14292aea4174ab073b0fc 100644 --- a/crypto/bn/README.pod +++ b/crypto/bn/README.pod @@ -188,7 +188,7 @@ B and the 2*B word arrays B and B. The implementations use the following macros which, depending on the architecture, may use "long long" C operations or inline assembler. -They are defined in C. +They are defined in C. mul(B, B, B, B) computes B*B+B and places the low word of the result in B and the high word in B. diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c index 31839ba060fa5a998cbd797571cc224f5c2bc67a..e6fdaadf0e91279598e484b2a25fdd976ea49790 100644 --- a/crypto/bn/asm/x86_64-gcc.c +++ b/crypto/bn/asm/x86_64-gcc.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "../bn_lcl.h" +#include "../bn_local.h" #if !(defined(__GNUC__) && __GNUC__>=2) # include "../bn_asm.c" /* kind of dirty hack for Sun Studio */ #else diff --git a/crypto/bn/bn_add.c b/crypto/bn/bn_add.c index f2736b8f6d4194abb83ef8a7d015eddf3bf5360c..8ffe49618a8be324d2727e50360263d979d06988 100644 --- a/crypto/bn/bn_add.c +++ b/crypto/bn/bn_add.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" /* signed add of b to a. */ int BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b) diff --git a/crypto/bn/bn_asm.c b/crypto/bn/bn_asm.c index 729b2480acd18e5af64d7b772604398ed65cb4b8..4d83a8cf1115de72cafcff85b43aa933f93db7cc 100644 --- a/crypto/bn/bn_asm.c +++ b/crypto/bn/bn_asm.c @@ -10,7 +10,7 @@ #include #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" #if defined(BN_LLONG) || defined(BN_UMULT_HIGH) diff --git a/crypto/bn/bn_blind.c b/crypto/bn/bn_blind.c index 450cdfb34866e65017d08cdad1cbf2c34ca838b1..76fc7ebcffc0b78fed134ddf2f0688b8a904e0d6 100644 --- a/crypto/bn/bn_blind.c +++ b/crypto/bn/bn_blind.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" #define BN_BLINDING_COUNTER 32 diff --git a/crypto/bn/bn_ctx.c b/crypto/bn/bn_ctx.c index 90cecea2aa5d28ad1b84f9fa52418d85b327860f..042cb247d37f786487b3b0037dead053594693f6 100644 --- a/crypto/bn/bn_ctx.c +++ b/crypto/bn/bn_ctx.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" /*- * TODO list diff --git a/crypto/bn/bn_depr.c b/crypto/bn/bn_depr.c index 58bcf197a490eb9aa6b340cf2f4d0f4a46cee4f7..b60269cd57a65d93e98d6210cbf02f4cfbe0f5a4 100644 --- a/crypto/bn/bn_depr.c +++ b/crypto/bn/bn_depr.c @@ -20,7 +20,7 @@ NON_EMPTY_TRANSLATION_UNIT # include # include # include "internal/cryptlib.h" -# include "bn_lcl.h" +# include "bn_local.h" BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe, const BIGNUM *add, const BIGNUM *rem, diff --git a/crypto/bn/bn_dh.c b/crypto/bn/bn_dh.c index 3f0af5e49d1d3fb4c88188427eb24369f009cc9f..58c44f0b179e3cbd8131284c40a5cba88b1a8ae1 100644 --- a/crypto/bn/bn_dh.c +++ b/crypto/bn/bn_dh.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "bn_lcl.h" +#include "bn_local.h" #include "internal/nelem.h" #ifndef OPENSSL_NO_DH diff --git a/crypto/bn/bn_div.c b/crypto/bn/bn_div.c index 7fc0132830a12aa6302010e7b6fb9066c02b78c7..286d69c895fd16dd2aa051f37514f2555d06fbd3 100644 --- a/crypto/bn/bn_div.c +++ b/crypto/bn/bn_div.c @@ -10,7 +10,7 @@ #include #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" /* The old slow way */ #if 0 diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c index 88f2baf0e553cf6629644a9a415be643dd0f07c4..9531acfc3c94848a177c5938e4b98a651f44b431 100644 --- a/crypto/bn/bn_exp.c +++ b/crypto/bn/bn_exp.c @@ -8,8 +8,8 @@ */ #include "internal/cryptlib.h" -#include "internal/constant_time_locl.h" -#include "bn_lcl.h" +#include "internal/constant_time.h" +#include "bn_local.h" #include #ifdef _WIN32 diff --git a/crypto/bn/bn_exp2.c b/crypto/bn/bn_exp2.c index 082c9286a0f4b38eb48ac05701eb84647e8c71fc..e542abe46fa10b5a783fc7dad8f2bfd9f8efa21f 100644 --- a/crypto/bn/bn_exp2.c +++ b/crypto/bn/bn_exp2.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" #define TABLE_SIZE 32 diff --git a/crypto/bn/bn_gcd.c b/crypto/bn/bn_gcd.c index 0091ea4e08a67cf1daedf50beb5fa8278fe05000..f0a91f5617aec4494a4e19b7336fa9cfb1fae666 100644 --- a/crypto/bn/bn_gcd.c +++ b/crypto/bn/bn_gcd.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" static BIGNUM *euclid(BIGNUM *a, BIGNUM *b); diff --git a/crypto/bn/bn_gf2m.c b/crypto/bn/bn_gf2m.c index 34d8b69c1ec9d70da5625809cc48c15e0df1bf88..a2ea8675518229c1534a8d37fa361f8be5e38e4b 100644 --- a/crypto/bn/bn_gf2m.c +++ b/crypto/bn/bn_gf2m.c @@ -12,7 +12,7 @@ #include #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" #ifndef OPENSSL_NO_EC2M diff --git a/crypto/bn/bn_intern.c b/crypto/bn/bn_intern.c index 46bc97575dfe47c8c8da0fc40327b96dbc41a2dd..147b4fa022cfe1b82ffc21eee887810c5ae179b7 100644 --- a/crypto/bn/bn_intern.c +++ b/crypto/bn/bn_intern.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" /* * Determine the modified width-(w+1) Non-Adjacent Form (wNAF) of 'scalar'. diff --git a/crypto/bn/bn_kron.c b/crypto/bn/bn_kron.c index b9bc6cca27fe8c5b7e796717816121e64f5d8325..c1e09d272120a6ac8cf8544155078f0f49d15364 100644 --- a/crypto/bn/bn_kron.c +++ b/crypto/bn/bn_kron.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" /* least significant word */ #define BN_lsw(n) (((n)->top == 0) ? (BN_ULONG) 0 : (n)->d[0]) diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c index 254069ff38198d7b61cc03e15516a124ffa908f1..86d4956c8a8cf297afd368dd5cc3d8d945e82759 100644 --- a/crypto/bn/bn_lib.c +++ b/crypto/bn/bn_lib.c @@ -10,9 +10,9 @@ #include #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" #include -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" /* This stuff appears to be completely unused, so is deprecated */ #if OPENSSL_API_COMPAT < 0x00908000L diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_local.h similarity index 100% rename from crypto/bn/bn_lcl.h rename to crypto/bn/bn_local.h diff --git a/crypto/bn/bn_mod.c b/crypto/bn/bn_mod.c index 712fc8ac145be2efad7b6ae876e4da4a0a43ac3d..f7d2e2650ed8b6ecac38b05428ffafca1f7091e8 100644 --- a/crypto/bn/bn_mod.c +++ b/crypto/bn/bn_mod.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx) { diff --git a/crypto/bn/bn_mont.c b/crypto/bn/bn_mont.c index 393d27c392c7383e6bd8784c52a992639ae3919d..1e5045a010bb70cf91e66aba4ff9022d79db97b9 100644 --- a/crypto/bn/bn_mont.c +++ b/crypto/bn/bn_mont.c @@ -15,7 +15,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" #define MONT_WORD /* use the faster word-based algorithm */ diff --git a/crypto/bn/bn_mpi.c b/crypto/bn/bn_mpi.c index 043e21d26a38c767ac9c4efb01de07f8c50c91bc..bdbe822415c7914c2f87e1150242b7310096ac15 100644 --- a/crypto/bn/bn_mpi.c +++ b/crypto/bn/bn_mpi.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" int BN_bn2mpi(const BIGNUM *a, unsigned char *d) { diff --git a/crypto/bn/bn_mul.c b/crypto/bn/bn_mul.c index 5eda65cfbb048105a697c5eaca64387454642fd5..6743e7be816697e1298ac717b1e59e7f57b6839d 100644 --- a/crypto/bn/bn_mul.c +++ b/crypto/bn/bn_mul.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" #if defined(OPENSSL_NO_ASM) || !defined(OPENSSL_BN_ASM_PART_WORDS) /* diff --git a/crypto/bn/bn_nist.c b/crypto/bn/bn_nist.c index dcdd321c6688cda6da783d0812edaa58570224da..325dc228490ad7cb153cd7396d974d39d062d2b0 100644 --- a/crypto/bn/bn_nist.c +++ b/crypto/bn/bn_nist.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "bn_lcl.h" +#include "bn_local.h" #include "internal/cryptlib.h" #define BN_NIST_192_TOP (192+BN_BITS2-1)/BN_BITS2 diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c index 19b081f38eb7b2d744548c83daaa907df45a1f95..6d74da26d3c702f52eea81bc58ceb1594f5dc824 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -10,7 +10,7 @@ #include #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" /* * The quick sieve algorithm approach to weeding out primes is Philip diff --git a/crypto/bn/bn_print.c b/crypto/bn/bn_print.c index 89a4ac31e6ac7e914d1896be8200b4577bbc5d8f..69749a9fa7dcbe1d10ec7590c29108b7af89ac7c 100644 --- a/crypto/bn/bn_print.c +++ b/crypto/bn/bn_print.c @@ -12,7 +12,7 @@ #include #include "internal/cryptlib.h" #include -#include "bn_lcl.h" +#include "bn_local.h" static const char Hex[] = "0123456789ABCDEF"; diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c index 051f29e34305cb6b9c2409423f00ab5f89abd6cb..6b4b50a068f1386b4da567ff6b5a0e00f4f9597e 100644 --- a/crypto/bn/bn_rand.c +++ b/crypto/bn/bn_rand.c @@ -10,7 +10,7 @@ #include #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" #include #include diff --git a/crypto/bn/bn_recp.c b/crypto/bn/bn_recp.c index 9ab767f42fe9ff869f60c209d2eeadde5522820e..e82231334123281afda42da8d3ea9d41ff6465ea 100644 --- a/crypto/bn/bn_recp.c +++ b/crypto/bn/bn_recp.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" void BN_RECP_CTX_init(BN_RECP_CTX *recp) { diff --git a/crypto/bn/bn_shift.c b/crypto/bn/bn_shift.c index b7a1e0ff9ae3c20b7ed93ad81c03e82a22198a1c..60c6ee418eb10520d6bb367cc95c7965ef5615a6 100644 --- a/crypto/bn/bn_shift.c +++ b/crypto/bn/bn_shift.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" int BN_lshift1(BIGNUM *r, const BIGNUM *a) { diff --git a/crypto/bn/bn_sqr.c b/crypto/bn/bn_sqr.c index 0c0a590f0c6ab1504bc4295e8c719b3b58b99b6f..7f3a179177b6af393fd321a0a9ac2e262beb2bbe 100644 --- a/crypto/bn/bn_sqr.c +++ b/crypto/bn/bn_sqr.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" /* r must not be a */ /* diff --git a/crypto/bn/bn_sqrt.c b/crypto/bn/bn_sqrt.c index c3e66b033bde5ffe2bfa3c73f36d8e936097819a..1723d5ded5a87a0d0b665df15678b6013bcce2f7 100644 --- a/crypto/bn/bn_sqrt.c +++ b/crypto/bn/bn_sqrt.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" BIGNUM *BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx) /* diff --git a/crypto/bn/bn_srp.c b/crypto/bn/bn_srp.c index de07b045d65e4d483a5c4a0df44d0d5b83086435..820757be60e3e13f8907b516a5798377f799ea75 100644 --- a/crypto/bn/bn_srp.c +++ b/crypto/bn/bn_srp.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "bn_lcl.h" +#include "bn_local.h" #include "internal/nelem.h" #ifndef OPENSSL_NO_SRP diff --git a/crypto/bn/bn_word.c b/crypto/bn/bn_word.c index 262d7668fcd4ee1c8d238d109aeb040dd7b145fc..18fb3030a8f441dd948765e44e2301ee26a5a83b 100644 --- a/crypto/bn/bn_word.c +++ b/crypto/bn/bn_word.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "bn_lcl.h" +#include "bn_local.h" BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w) { diff --git a/crypto/bn/bn_x931p.c b/crypto/bn/bn_x931p.c index 9eb8384fdeb2810e954e61e241331c3366186ec9..009950259d418fd17f9a571d3069e61299f1ff7b 100644 --- a/crypto/bn/bn_x931p.c +++ b/crypto/bn/bn_x931p.c @@ -9,7 +9,7 @@ #include #include -#include "bn_lcl.h" +#include "bn_local.h" /* X9.31 routines for prime derivation */ diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c index c200b823041b029a54a70e5035717aea61fc12ab..f623864bc41341f18083f395c29aef1330a4291c 100644 --- a/crypto/camellia/camellia.c +++ b/crypto/camellia/camellia.c @@ -40,7 +40,7 @@ */ #include -#include "cmll_locl.h" +#include "cmll_local.h" #include #include diff --git a/crypto/camellia/cmll_ecb.c b/crypto/camellia/cmll_ecb.c index d932f1b37517b96fdde7a2cc6d42ef49f0442f76..5760d1ed35fc608e3b94193d74a6781bfb2c237a 100644 --- a/crypto/camellia/cmll_ecb.c +++ b/crypto/camellia/cmll_ecb.c @@ -8,7 +8,7 @@ */ #include -#include "cmll_locl.h" +#include "cmll_local.h" void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out, const CAMELLIA_KEY *key, const int enc) diff --git a/crypto/camellia/cmll_locl.h b/crypto/camellia/cmll_local.h similarity index 100% rename from crypto/camellia/cmll_locl.h rename to crypto/camellia/cmll_local.h diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c index e5f014b79cbcd758778dd9347c1c60fa95f73ade..d8fc3738c4048f58ed5a77170e32d12d28898368 100644 --- a/crypto/camellia/cmll_misc.c +++ b/crypto/camellia/cmll_misc.c @@ -9,7 +9,7 @@ #include #include -#include "cmll_locl.h" +#include "cmll_local.h" int Camellia_set_key(const unsigned char *userKey, const int bits, CAMELLIA_KEY *key) diff --git a/crypto/cast/c_cfb64.c b/crypto/cast/c_cfb64.c index bd7cb2f4684301a57481fe1c170f38d673e64204..72221595382b5e83d28912295b8c21a5c89c3eaa 100644 --- a/crypto/cast/c_cfb64.c +++ b/crypto/cast/c_cfb64.c @@ -8,7 +8,7 @@ */ #include -#include "cast_lcl.h" +#include "cast_local.h" /* * The input and output encrypted as though 64bit cfb mode is being used. diff --git a/crypto/cast/c_ecb.c b/crypto/cast/c_ecb.c index da4179438f1d465902d5498b0967500f12481124..6fe093f75b1b4f04766209761ff61b8ca3a0fa16 100644 --- a/crypto/cast/c_ecb.c +++ b/crypto/cast/c_ecb.c @@ -8,7 +8,7 @@ */ #include -#include "cast_lcl.h" +#include "cast_local.h" #include void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out, diff --git a/crypto/cast/c_enc.c b/crypto/cast/c_enc.c index 700b6d162a9fbcd36c92fe66f34d21a34ca4b542..d27d1fc0a54fcc4f07108988709c54dda1673de4 100644 --- a/crypto/cast/c_enc.c +++ b/crypto/cast/c_enc.c @@ -8,7 +8,7 @@ */ #include -#include "cast_lcl.h" +#include "cast_local.h" void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key) { diff --git a/crypto/cast/c_ofb64.c b/crypto/cast/c_ofb64.c index dffb074762c2b9f594ba238a72ab3b54a7670213..49c0cfade5775c0bf189c5e2865bd8c4ec994507 100644 --- a/crypto/cast/c_ofb64.c +++ b/crypto/cast/c_ofb64.c @@ -8,7 +8,7 @@ */ #include -#include "cast_lcl.h" +#include "cast_local.h" /* * The input and output encrypted as though 64bit ofb mode is being used. diff --git a/crypto/cast/c_skey.c b/crypto/cast/c_skey.c index 962d2a60b4c5d9e236ada8187f7aec6ab6fd0154..0311482d20ddbbefbf1aabd8e49fbbaa2b8c9854 100644 --- a/crypto/cast/c_skey.c +++ b/crypto/cast/c_skey.c @@ -8,7 +8,7 @@ */ #include -#include "cast_lcl.h" +#include "cast_local.h" #include "cast_s.h" #define CAST_exp(l,A,a,n) \ diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_local.h similarity index 100% rename from crypto/cast/cast_lcl.h rename to crypto/cast/cast_local.h diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c index 993ea6b219ab796a40411ed1edc58c5e7cadc60d..08069d72a29e27f5ea05bdee6544ecd1587fdb21 100644 --- a/crypto/cms/cms_asn1.c +++ b/crypto/cms/cms_asn1.c @@ -11,7 +11,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" ASN1_SEQUENCE(CMS_IssuerAndSerialNumber) = { diff --git a/crypto/cms/cms_att.c b/crypto/cms/cms_att.c index 0566019753bddaeb1972e0f662d16e1fc3f263fb..4f716619193ad489550d3ff7ce84abec866470b0 100644 --- a/crypto/cms/cms_att.c +++ b/crypto/cms/cms_att.c @@ -12,7 +12,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" #include "internal/nelem.h" /*- diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c index f05e308418f887d20eca44961a9c53c5ee40f955..45365b8ba2476194107325f392ae9146b9a1e195 100644 --- a/crypto/cms/cms_cd.c +++ b/crypto/cms/cms_cd.c @@ -15,7 +15,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" #ifdef ZLIB diff --git a/crypto/cms/cms_dd.c b/crypto/cms/cms_dd.c index 5da6802fcd5e6f0fd86a47a9ba0c6b89a620fad3..0df2e698c2379ce32f2946b2df468876e77ea505 100644 --- a/crypto/cms/cms_dd.c +++ b/crypto/cms/cms_dd.c @@ -13,7 +13,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" /* CMS DigestedData Utilities */ diff --git a/crypto/cms/cms_enc.c b/crypto/cms/cms_enc.c index a1719830e8d4f0ac570e8c986cb9484902ac71cb..fc490303d4c6da473e029a66bec405025ba82380 100644 --- a/crypto/cms/cms_enc.c +++ b/crypto/cms/cms_enc.c @@ -14,7 +14,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" /* CMS EncryptedData Utilities */ diff --git a/crypto/cms/cms_env.c b/crypto/cms/cms_env.c index 5d8615c03eac5a8c1d37c62d3e6fb626af0d0d25..04940146fd253c451a4a35963e9bdfa9bd8c46d0 100644 --- a/crypto/cms/cms_env.c +++ b/crypto/cms/cms_env.c @@ -14,7 +14,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" #include "crypto/asn1.h" #include "crypto/evp.h" diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c index 4780231c22bb3e7f2d9a20dc2da46a4c7ac07175..a21c443ae85e9095d72dc9b563be864bdeee5745 100644 --- a/crypto/cms/cms_ess.c +++ b/crypto/cms/cms_ess.c @@ -14,7 +14,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" IMPLEMENT_ASN1_FUNCTIONS(CMS_ReceiptRequest) diff --git a/crypto/cms/cms_io.c b/crypto/cms/cms_io.c index d18f980a973235e9a1028884cc034fb6cbfa6c59..b37e485f5a282364a74fe13419b5508599d987f2 100644 --- a/crypto/cms/cms_io.c +++ b/crypto/cms/cms_io.c @@ -12,7 +12,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms) { diff --git a/crypto/cms/cms_kari.c b/crypto/cms/cms_kari.c index 7398918317e7f4c95f5590f2fa2c213c67829189..3980bf8f3f9c9c47233ca9c96717382704022509 100644 --- a/crypto/cms/cms_kari.c +++ b/crypto/cms/cms_kari.c @@ -14,7 +14,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" #include "crypto/asn1.h" /* Key Agreement Recipient Info (KARI) routines */ diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c index c2cac260109d1f6dd3f6eb2fcdc53fa5fdbc5a60..57afba436115045a90d6d6b10c47635a8d0a833b 100644 --- a/crypto/cms/cms_lib.c +++ b/crypto/cms/cms_lib.c @@ -14,7 +14,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" IMPLEMENT_ASN1_FUNCTIONS(CMS_ContentInfo) IMPLEMENT_ASN1_PRINT_FUNCTION(CMS_ContentInfo) diff --git a/crypto/cms/cms_lcl.h b/crypto/cms/cms_local.h similarity index 100% rename from crypto/cms/cms_lcl.h rename to crypto/cms/cms_local.h diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c index 159d7880406978312e3400bb7c32fb53b9d3d18d..d7414883396cb5c592f0e20ccc5bf1471caf3711 100644 --- a/crypto/cms/cms_pwri.c +++ b/crypto/cms/cms_pwri.c @@ -15,7 +15,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" #include "crypto/asn1.h" int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c index face7e2aa8fac353f35a73c585668bb063bc55b4..29ba4c1b13342819e48fd8c8e2f5857560217500 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -14,7 +14,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" #include "crypto/asn1.h" #include "crypto/evp.h" diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index e0f5dc872a524f98d33d12af5246c069ceb051a4..652e97b2e877fd3cd132473ca042750c47b8cccf 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -13,7 +13,7 @@ #include #include #include -#include "cms_lcl.h" +#include "cms_local.h" #include "crypto/asn1.h" static BIO *cms_get_text_bio(BIO *out, unsigned int flags) diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index a23d0d0bc2547b78c72027ff48723c3b4f9f24ab..b8193379131232f730b14bfbdccfb6d027421e7c 100644 --- a/crypto/comp/c_zlib.c +++ b/crypto/comp/c_zlib.c @@ -15,7 +15,7 @@ #include #include "crypto/cryptlib.h" #include "internal/bio.h" -#include "comp_lcl.h" +#include "comp_local.h" COMP_METHOD *COMP_zlib(void); diff --git a/crypto/comp/comp_lib.c b/crypto/comp/comp_lib.c index 6ae2114496b03b24a18cc4b5f19e69719f16b805..56920e1cca5110d3b2bf1c749731c81e47589389 100644 --- a/crypto/comp/comp_lib.c +++ b/crypto/comp/comp_lib.c @@ -13,7 +13,7 @@ #include #include #include -#include "comp_lcl.h" +#include "comp_local.h" COMP_CTX *COMP_CTX_new(COMP_METHOD *meth) { diff --git a/crypto/comp/comp_lcl.h b/crypto/comp/comp_local.h similarity index 100% rename from crypto/comp/comp_lcl.h rename to crypto/comp/comp_local.h diff --git a/crypto/conf/conf_lcl.h b/crypto/conf/conf_local.h similarity index 100% rename from crypto/conf/conf_lcl.h rename to crypto/conf/conf_local.h diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c index 7e86948e89e9e7c39ef1f3f1399be53295ae9277..d7eaa8509b2fbc008ab95d5c5566a14681554f99 100644 --- a/crypto/conf/conf_mall.c +++ b/crypto/conf/conf_mall.c @@ -14,7 +14,7 @@ #include #include #include -#include "conf_lcl.h" +#include "conf_local.h" /* Load all OpenSSL builtin modules */ diff --git a/crypto/conf/conf_ssl.c b/crypto/conf/conf_ssl.c index 387f2cf46c31b78c5edd223c08b3f982a96393b8..4bd8117d365ca63faa87cc47632c464a2ec188f9 100644 --- a/crypto/conf/conf_ssl.c +++ b/crypto/conf/conf_ssl.c @@ -12,7 +12,7 @@ #include #include #include "internal/sslconf.h" -#include "conf_lcl.h" +#include "conf_local.h" /* * SSL library configuration module placeholder. We load it here but defer diff --git a/crypto/ct/ct_b64.c b/crypto/ct/ct_b64.c index 109ffcdcf24ad5a90ebb167887d1ac346a0c23f1..4abe11ca298bd9ffd70a23bf4a17e6b6d95c0c10 100644 --- a/crypto/ct/ct_b64.c +++ b/crypto/ct/ct_b64.c @@ -14,7 +14,7 @@ #include #include -#include "ct_locl.h" +#include "ct_local.h" /* * Decodes the base64 string |in| into |out|. diff --git a/crypto/ct/ct_locl.h b/crypto/ct/ct_local.h similarity index 100% rename from crypto/ct/ct_locl.h rename to crypto/ct/ct_local.h diff --git a/crypto/ct/ct_oct.c b/crypto/ct/ct_oct.c index 0dd691c0f711d4907c7751591940ffba75222f2c..d4b6645af48d8800d7bc63a7caf8614aee6b97d5 100644 --- a/crypto/ct/ct_oct.c +++ b/crypto/ct/ct_oct.c @@ -19,7 +19,7 @@ #include #include -#include "ct_locl.h" +#include "ct_local.h" int o2i_SCT_signature(SCT *sct, const unsigned char **in, size_t len) { diff --git a/crypto/ct/ct_policy.c b/crypto/ct/ct_policy.c index 0d7b3463877d2b94ac2303f2d4bea4fde1d75518..df66e8a494d015fd24713c1070707168fbb2ceb8 100644 --- a/crypto/ct/ct_policy.c +++ b/crypto/ct/ct_policy.c @@ -15,7 +15,7 @@ #include #include -#include "ct_locl.h" +#include "ct_local.h" /* * Number of seconds in the future that an SCT timestamp can be, by default, diff --git a/crypto/ct/ct_prn.c b/crypto/ct/ct_prn.c index 376e04523e5726b4fc42d2945a8785dbbfc48c1c..e6584b57f391c9a7a0485bfd570a34ea2238a5a4 100644 --- a/crypto/ct/ct_prn.c +++ b/crypto/ct/ct_prn.c @@ -14,7 +14,7 @@ #include #include -#include "ct_locl.h" +#include "ct_local.h" static void SCT_signature_algorithms_print(const SCT *sct, BIO *out) { diff --git a/crypto/ct/ct_sct.c b/crypto/ct/ct_sct.c index 1dc16857ba50ba6176d4abee00044f01bbe47826..4ff36e2fbd4940088b015cb37b50010b8f571fa8 100644 --- a/crypto/ct/ct_sct.c +++ b/crypto/ct/ct_sct.c @@ -17,7 +17,7 @@ #include #include -#include "ct_locl.h" +#include "ct_local.h" SCT *SCT_new(void) { diff --git a/crypto/ct/ct_sct_ctx.c b/crypto/ct/ct_sct_ctx.c index 75a5027df0e8a5f56fd1dd0308f0875b07eca15b..841e768033e5a9fac54ce0053d3bc61c4389b19e 100644 --- a/crypto/ct/ct_sct_ctx.c +++ b/crypto/ct/ct_sct_ctx.c @@ -18,7 +18,7 @@ #include #include -#include "ct_locl.h" +#include "ct_local.h" SCT_CTX *SCT_CTX_new(void) { diff --git a/crypto/ct/ct_vfy.c b/crypto/ct/ct_vfy.c index cabcf5782aa445a49a2a771d1354172a3b818c12..74fd34f4154eebf639945f0a6d529d99ae37c38e 100644 --- a/crypto/ct/ct_vfy.c +++ b/crypto/ct/ct_vfy.c @@ -14,7 +14,7 @@ #include #include -#include "ct_locl.h" +#include "ct_local.h" typedef enum sct_signature_type_t { SIGNATURE_TYPE_NOT_SET = -1, diff --git a/crypto/ct/ct_x509v3.c b/crypto/ct/ct_x509v3.c index ec186d1f5b83095d18fee4248c82ae44cf1f8467..19c2a852d24a182edbc87c19d383fdd1adbd6d40 100644 --- a/crypto/ct/ct_x509v3.c +++ b/crypto/ct/ct_x509v3.c @@ -11,7 +11,7 @@ # error "CT is disabled" #endif -#include "ct_locl.h" +#include "ct_local.h" static char *i2s_poison(const X509V3_EXT_METHOD *method, void *val) { diff --git a/crypto/des/cbc_cksm.c b/crypto/des/cbc_cksm.c index 5a1f72f82db83afdcc049965c991fefa1eefb41d..c5e2e017b84e02a973a045c1c6e1f623b3d5353a 100644 --- a/crypto/des/cbc_cksm.c +++ b/crypto/des/cbc_cksm.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "des_locl.h" +#include "des_local.h" DES_LONG DES_cbc_cksum(const unsigned char *in, DES_cblock *output, long length, DES_key_schedule *schedule, diff --git a/crypto/des/cfb64ede.c b/crypto/des/cfb64ede.c index 21943f6143ead9c3926a1aab1b3b33131a65e34b..490d925f46f476b933983b0865b825cc8e7a4be6 100644 --- a/crypto/des/cfb64ede.c +++ b/crypto/des/cfb64ede.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "des_locl.h" +#include "des_local.h" /* * The input and output encrypted as though 64bit cfb mode is being used. diff --git a/crypto/des/cfb64enc.c b/crypto/des/cfb64enc.c index 96de51b055ec4cd9d19fb07ebc95d2f13a25d85d..ca0e82164803cb5914a28bc2cf756c596c18ccdf 100644 --- a/crypto/des/cfb64enc.c +++ b/crypto/des/cfb64enc.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "des_locl.h" +#include "des_local.h" /* * The input and output encrypted as though 64bit cfb mode is being used. diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c index 544392e405c2ccf7bd1090f68d2a1726c6a6db39..17018420e6cc020931ed7cd366a7329ff2d88d49 100644 --- a/crypto/des/cfb_enc.c +++ b/crypto/des/cfb_enc.c @@ -8,7 +8,7 @@ */ #include "e_os.h" -#include "des_locl.h" +#include "des_local.h" #include /* diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c index ed134ace8c3228316bdff08580fbc4d6ea604c1a..45eec615d8b0b28282d1d7339cbd4bb986465869 100644 --- a/crypto/des/des_enc.c +++ b/crypto/des/des_enc.c @@ -8,7 +8,7 @@ */ #include -#include "des_locl.h" +#include "des_local.h" #include "spr.h" void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc) diff --git a/crypto/des/des_locl.h b/crypto/des/des_local.h similarity index 100% rename from crypto/des/des_locl.h rename to crypto/des/des_local.h diff --git a/crypto/des/ecb3_enc.c b/crypto/des/ecb3_enc.c index 6ac89d4e78bb61029b4d5acf9bbab4d03065e71f..7afa8eaadde7ce1d544ee79020976c6ff96c3385 100644 --- a/crypto/des/ecb3_enc.c +++ b/crypto/des/ecb3_enc.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "des_locl.h" +#include "des_local.h" void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output, DES_key_schedule *ks1, DES_key_schedule *ks2, diff --git a/crypto/des/ecb_enc.c b/crypto/des/ecb_enc.c index 5ed079d15fdc53dd3d436ba0421131a27019749d..513c65e116cdbad9f695c280b085916c56a9ba09 100644 --- a/crypto/des/ecb_enc.c +++ b/crypto/des/ecb_enc.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "des_locl.h" +#include "des_local.h" #include #include diff --git a/crypto/des/fcrypt.c b/crypto/des/fcrypt.c index aaee4bf236a532f03c4bb9625a12029b2499998d..e83cf76b615cceb35975afadb5efd50f53c18af0 100644 --- a/crypto/des/fcrypt.c +++ b/crypto/des/fcrypt.c @@ -19,7 +19,7 @@ #endif #include -#include "des_locl.h" +#include "des_local.h" /* * Added more values to handle illegal salt values the way normal crypt() diff --git a/crypto/des/fcrypt_b.c b/crypto/des/fcrypt_b.c index fe2369a93526c1351c89f95873bb000f78606f1c..22f967b8c6d389392ebae681dda72e70f09163e4 100644 --- a/crypto/des/fcrypt_b.c +++ b/crypto/des/fcrypt_b.c @@ -10,7 +10,7 @@ #include #define DES_FCRYPT -#include "des_locl.h" +#include "des_local.h" #undef DES_FCRYPT #undef PERM_OP diff --git a/crypto/des/ncbc_enc.c b/crypto/des/ncbc_enc.c index 244f15ca2a9600f15524760ca56bc06a3d81cb76..cd4b071a3d73b9ffc16bb562c55104ba731a92ba 100644 --- a/crypto/des/ncbc_enc.c +++ b/crypto/des/ncbc_enc.c @@ -13,7 +13,7 @@ * des_enc.c (DES_ncbc_encrypt) */ -#include "des_locl.h" +#include "des_local.h" #ifdef CBC_ENC_C__DONT_UPDATE_IV void DES_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, diff --git a/crypto/des/ofb64ede.c b/crypto/des/ofb64ede.c index a551a07e0eb49d70665a4ba66fa9d13c69d5d8f7..68cf2dc557c64d4f2c517b35096321d10dee2bc7 100644 --- a/crypto/des/ofb64ede.c +++ b/crypto/des/ofb64ede.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "des_locl.h" +#include "des_local.h" /* * The input and output encrypted as though 64bit ofb mode is being used. diff --git a/crypto/des/ofb64enc.c b/crypto/des/ofb64enc.c index 30976c871daa12e2d4c34071891db34ec4b08d4f..5796980c186537a4d41aa6c346273d183cc5348a 100644 --- a/crypto/des/ofb64enc.c +++ b/crypto/des/ofb64enc.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "des_locl.h" +#include "des_local.h" /* * The input and output encrypted as though 64bit ofb mode is being used. diff --git a/crypto/des/ofb_enc.c b/crypto/des/ofb_enc.c index 65a9b8604d8032777586a9529c56336f4960dbb5..2b0498994b5158bba2ab96d3de7df184d59f5b01 100644 --- a/crypto/des/ofb_enc.c +++ b/crypto/des/ofb_enc.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "des_locl.h" +#include "des_local.h" /* * The input and output are loaded in multiples of 8 bits. What this means is diff --git a/crypto/des/pcbc_enc.c b/crypto/des/pcbc_enc.c index 0fa058f03f076807aa0317e414152498b5ac8618..3490592741c60fd12bb9645bc1cc0337d3010858 100644 --- a/crypto/des/pcbc_enc.c +++ b/crypto/des/pcbc_enc.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "des_locl.h" +#include "des_local.h" void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output, long length, DES_key_schedule *schedule, diff --git a/crypto/des/qud_cksm.c b/crypto/des/qud_cksm.c index 81e6be8226aaf7d18c1a443123f665432a9cf54b..10b6abf69ea5d549859dde1af5b62cb10cc525b2 100644 --- a/crypto/des/qud_cksm.c +++ b/crypto/des/qud_cksm.c @@ -13,7 +13,7 @@ * only based on the code in this paper and is almost definitely not the same * as the MIT implementation. */ -#include "des_locl.h" +#include "des_local.h" #define Q_B0(a) (((DES_LONG)(a))) #define Q_B1(a) (((DES_LONG)(a))<<8) diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c index adbad72362f53eee58b6d4a58c5996c0a56e52a5..cbcb616cb2add85123ddb89e55bb1e33fd63068a 100644 --- a/crypto/des/set_key.c +++ b/crypto/des/set_key.c @@ -16,7 +16,7 @@ * 1.0 First working version */ #include -#include "des_locl.h" +#include "des_local.h" /* defaults to false */ OPENSSL_IMPLEMENT_GLOBAL(int, DES_check_key, 0) diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c index e18d726522ba310e39680f2e0d79b281fa77b78e..61db60512567c5be6a5ca088869e050ed691841c 100644 --- a/crypto/des/str2key.c +++ b/crypto/des/str2key.c @@ -8,7 +8,7 @@ */ #include -#include "des_locl.h" +#include "des_local.h" void DES_string_to_key(const char *str, DES_cblock *key) { diff --git a/crypto/des/xcbc_enc.c b/crypto/des/xcbc_enc.c index c4e455d9b9125f080aa631ab1ddbc7ebdb3ec2de..fb3fd5292cb684821e0466f3693319060ea27d4d 100644 --- a/crypto/des/xcbc_enc.c +++ b/crypto/des/xcbc_enc.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "des_locl.h" +#include "des_local.h" /* RSA's DESX */ diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index 57705e497b484b8be5e576ddc903703faca823f6..60af9e21593ff8ed08f3e9d59f3dccfcc28c9ab1 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include #include -#include "dh_locl.h" +#include "dh_local.h" #include #include "crypto/asn1.h" #include "crypto/evp.h" diff --git a/crypto/dh/dh_asn1.c b/crypto/dh/dh_asn1.c index 1a40633b48065ea1326d36d14135627b3e1eee13..e37f0904e560c6ef5faed60d0d6bf10e464a464f 100644 --- a/crypto/dh/dh_asn1.c +++ b/crypto/dh/dh_asn1.c @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include -#include "dh_locl.h" +#include "dh_local.h" #include #include diff --git a/crypto/dh/dh_check.c b/crypto/dh/dh_check.c index d13d8206ce50930662a08904c1e9b0ea3d1b467b..4ac169e75c236c69d78e7e5fe38a4f1de035c6fc 100644 --- a/crypto/dh/dh_check.c +++ b/crypto/dh/dh_check.c @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include -#include "dh_locl.h" +#include "dh_local.h" # define DH_NUMBER_ITERATIONS_FOR_PRIME 64 diff --git a/crypto/dh/dh_gen.c b/crypto/dh/dh_gen.c index d293835eb22b7e0f71c2661d3d764535d78f93b8..1350f78e4e318344cf8a7d5947e6e2a4662a47a4 100644 --- a/crypto/dh/dh_gen.c +++ b/crypto/dh/dh_gen.c @@ -15,7 +15,7 @@ #include #include "internal/cryptlib.h" #include -#include "dh_locl.h" +#include "dh_local.h" static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb); diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c index 6aef7f2420292778deacc7c2ff042d1e54f4c543..daffdf74dd37b6fa4c3ad4c1669cd1c8fcc01963 100644 --- a/crypto/dh/dh_key.c +++ b/crypto/dh/dh_key.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" -#include "dh_locl.h" +#include "dh_local.h" #include "crypto/bn.h" static int generate_key(DH *dh); diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c index e7e7ef08e9e3ce961a4967dc29ee61add5476f80..04b79d355ca48ca2ecb138e8a28a91a891b83711 100644 --- a/crypto/dh/dh_lib.c +++ b/crypto/dh/dh_lib.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include "internal/refcount.h" #include -#include "dh_locl.h" +#include "dh_local.h" #include int DH_set_method(DH *dh, const DH_METHOD *meth) diff --git a/crypto/dh/dh_locl.h b/crypto/dh/dh_local.h similarity index 100% rename from crypto/dh/dh_locl.h rename to crypto/dh/dh_local.h diff --git a/crypto/dh/dh_meth.c b/crypto/dh/dh_meth.c index 59c4d7e967823303a4568125f142a6abcb68deb1..8a54a8108fc3fd75b0bc309c3671127bcf281c24 100644 --- a/crypto/dh/dh_meth.c +++ b/crypto/dh/dh_meth.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "dh_locl.h" +#include "dh_local.h" #include #include diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c index fc317e274e94b79379da7dcae148a23f17286083..1fd94deb4731954542eff40e27fc1427bd871a69 100644 --- a/crypto/dh/dh_pmeth.c +++ b/crypto/dh/dh_pmeth.c @@ -12,7 +12,7 @@ #include #include #include -#include "dh_locl.h" +#include "dh_local.h" #include #include #include diff --git a/crypto/dh/dh_rfc5114.c b/crypto/dh/dh_rfc5114.c index 94175584356140ce9ed8be10971774f547ed9be0..e3603a05a322b83c735965648d455fc4ec81e84f 100644 --- a/crypto/dh/dh_rfc5114.c +++ b/crypto/dh/dh_rfc5114.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" -#include "dh_locl.h" +#include "dh_local.h" #include #include "crypto/bn_dh.h" diff --git a/crypto/dh/dh_rfc7919.c b/crypto/dh/dh_rfc7919.c index 09c9ce7b9dbe069f9864fa1d283cda2b56928c10..03d30a1f5d59880596662bd19d105eb74da06f77 100644 --- a/crypto/dh/dh_rfc7919.c +++ b/crypto/dh/dh_rfc7919.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" -#include "dh_locl.h" +#include "dh_local.h" #include #include #include "crypto/bn_dh.h" diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c index 343d0fd5bbef9cb57294d5b6289f2f70cd691c60..2dcaa0815fd6eda43299c0b1574a4e2765c49000 100644 --- a/crypto/dsa/dsa_ameth.c +++ b/crypto/dsa/dsa_ameth.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include #include -#include "dsa_locl.h" +#include "dsa_local.h" #include #include #include "crypto/asn1.h" diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c index 6499e87ef31893886d47204021a1c3ee451f9ab8..9cafd5ca8a90b2e4f6f23edd9434adaa83059cfa 100644 --- a/crypto/dsa/dsa_asn1.c +++ b/crypto/dsa/dsa_asn1.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" -#include "dsa_locl.h" +#include "dsa_local.h" #include #include #include diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c index af59a582b53e4e3ac384d2ed2f8e08a7f904bf23..5d066a06c546d9d6cf0e56cabd201cc12e24f1e2 100644 --- a/crypto/dsa/dsa_gen.c +++ b/crypto/dsa/dsa_gen.c @@ -21,7 +21,7 @@ #include #include #include -#include "dsa_locl.h" +#include "dsa_local.h" int DSA_generate_parameters_ex(DSA *ret, int bits, const unsigned char *seed_in, int seed_len, diff --git a/crypto/dsa/dsa_key.c b/crypto/dsa/dsa_key.c index a48af58492914c02807cc4c28adda5f5ce518dd4..bdeddd4f61df9b519def39d92d2f7ab49f415c01 100644 --- a/crypto/dsa/dsa_key.c +++ b/crypto/dsa/dsa_key.c @@ -11,7 +11,7 @@ #include #include "internal/cryptlib.h" #include -#include "dsa_locl.h" +#include "dsa_local.h" static int dsa_builtin_keygen(DSA *dsa); diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index 1048601bebde3896bddf4a06a6c3a6358ce4b0da..f98af5853dc1207592344760460ae2e603275d4e 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include "internal/refcount.h" #include -#include "dsa_locl.h" +#include "dsa_local.h" #include #include #include diff --git a/crypto/dsa/dsa_locl.h b/crypto/dsa/dsa_local.h similarity index 100% rename from crypto/dsa/dsa_locl.h rename to crypto/dsa/dsa_local.h diff --git a/crypto/dsa/dsa_meth.c b/crypto/dsa/dsa_meth.c index ff4fae44a7c309d6f1dc4ddddea4469a773e783f..1e6ee2f4ed3bc65e0ac3608cd9a5c2eaa0185469 100644 --- a/crypto/dsa/dsa_meth.c +++ b/crypto/dsa/dsa_meth.c @@ -15,7 +15,7 @@ * or in the file LICENSE in the source distribution. */ -#include "dsa_locl.h" +#include "dsa_local.h" #include #include diff --git a/crypto/dsa/dsa_ossl.c b/crypto/dsa/dsa_ossl.c index 1d28684e3c4ad3ae14381b96bd03cb921478fad9..a983def64e76ebf580538403f17567aeb395cda4 100644 --- a/crypto/dsa/dsa_ossl.c +++ b/crypto/dsa/dsa_ossl.c @@ -12,7 +12,7 @@ #include "crypto/bn.h" #include #include -#include "dsa_locl.h" +#include "dsa_local.h" #include static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa); diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c index a085b902a882545739d69a2694f081554240031e..80e5735d83eb94526f3d0bedd3c05051e98eb08d 100644 --- a/crypto/dsa/dsa_pmeth.c +++ b/crypto/dsa/dsa_pmeth.c @@ -14,7 +14,7 @@ #include #include #include "crypto/evp.h" -#include "dsa_locl.h" +#include "dsa_local.h" /* DSA pkey context structure */ diff --git a/crypto/dsa/dsa_sign.c b/crypto/dsa/dsa_sign.c index e9466b29f1d7bfd3139f038e6cd3642780d2ebd3..51c7754b93e463858844e5d3c276c41c00681da3 100644 --- a/crypto/dsa/dsa_sign.c +++ b/crypto/dsa/dsa_sign.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "dsa_locl.h" +#include "dsa_local.h" #include DSA_SIG *DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa) diff --git a/crypto/dsa/dsa_vrf.c b/crypto/dsa/dsa_vrf.c index 21f98cd94e5c14588c3c45fc241c75a0a6fe0cf7..6f80a4aab7a59051eaba9b295fc6e14b06c71eac 100644 --- a/crypto/dsa/dsa_vrf.c +++ b/crypto/dsa/dsa_vrf.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "dsa_locl.h" +#include "dsa_local.h" int DSA_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa) diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c index 290d73cf3575ba2081c7db91dd7c34ddc030e12a..3bbb10e5ca987b444d9a57e677c2a21d8be500dc 100644 --- a/crypto/dso/dso_dl.c +++ b/crypto/dso/dso_dl.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "dso_locl.h" +#include "dso_local.h" #ifdef DSO_DL diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index ba3b55fcbffad118b38bf745ccd4473693438838..4719e8f4f3376734f1514ae16f30ca0c6a560822 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -16,7 +16,7 @@ # define _GNU_SOURCE /* make sure dladdr is declared */ #endif -#include "dso_locl.h" +#include "dso_local.h" #include "e_os.h" #ifdef DSO_DLFCN diff --git a/crypto/dso/dso_lib.c b/crypto/dso/dso_lib.c index 2e75021d39ea63adb3da030c74b12d96969d3138..50a39bb7d5d8a25c1b784d84cf4c75158c3c9566 100644 --- a/crypto/dso/dso_lib.c +++ b/crypto/dso/dso_lib.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "dso_locl.h" +#include "dso_local.h" #include "internal/refcount.h" static DSO_METHOD *default_DSO_meth = NULL; diff --git a/crypto/dso/dso_locl.h b/crypto/dso/dso_local.h similarity index 100% rename from crypto/dso/dso_locl.h rename to crypto/dso/dso_local.h diff --git a/crypto/dso/dso_openssl.c b/crypto/dso/dso_openssl.c index f0dd38ace2599e7d2596c8c58c50e4319f1ddb3a..c76a04db23f980a01739d2eb4e8bcea80f85d88e 100644 --- a/crypto/dso/dso_openssl.c +++ b/crypto/dso/dso_openssl.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "dso_locl.h" +#include "dso_local.h" #ifdef DSO_NONE diff --git a/crypto/dso/dso_vms.c b/crypto/dso/dso_vms.c index 178e7257983124904fa6184fd85c79f42c8f1b4f..9d1066f915acb7f88666810f12aef0ac19c1c4e2 100644 --- a/crypto/dso/dso_vms.c +++ b/crypto/dso/dso_vms.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "dso_locl.h" +#include "dso_local.h" #ifdef OPENSSL_SYS_VMS diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index 6631d517f4c317c8bdee896c9e8581a73316eb18..37892170c0f225ab8709c30d5825da7f8b2c58d8 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -8,7 +8,7 @@ */ #include "e_os.h" -#include "dso_locl.h" +#include "dso_local.h" #if defined(DSO_WIN32) diff --git a/crypto/ec/curve25519.c b/crypto/ec/curve25519.c index c5d887ec4cd49fb84680f28b9ef3133f24d28346..952da0e653853c46161c2d834cf8dc826e2fdc67 100644 --- a/crypto/ec/curve25519.c +++ b/crypto/ec/curve25519.c @@ -8,7 +8,7 @@ */ #include -#include "ec_lcl.h" +#include "ec_local.h" #include #if defined(X25519_ASM) && (defined(__x86_64) || defined(__x86_64__) || \ diff --git a/crypto/ec/curve448/arch_32/arch_intrinsics.h b/crypto/ec/curve448/arch_32/arch_intrinsics.h index 48081c77170b089e3672e428611e6a0dfa0fddf3..c464108a9dbdbe9d0d8856e74587a9a06d67a0b8 100644 --- a/crypto/ec/curve448/arch_32/arch_intrinsics.h +++ b/crypto/ec/curve448/arch_32/arch_intrinsics.h @@ -13,7 +13,7 @@ #ifndef HEADER_ARCH_32_ARCH_INTRINSICS_H # define HEADER_ARCH_32_ARCH_INTRINSICS_H -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" # define ARCH_WORD_BITS 32 diff --git a/crypto/ec/curve448/curve448.c b/crypto/ec/curve448/curve448.c index 19bd3857812c53ee308ad21c97a8e3e81f66ed8e..12d97f06795b50966e094a30380f9be33055df39 100644 --- a/crypto/ec/curve448/curve448.c +++ b/crypto/ec/curve448/curve448.c @@ -15,7 +15,7 @@ #include "point_448.h" #include "ed448.h" -#include "curve448_lcl.h" +#include "curve448_local.h" #define COFACTOR 4 diff --git a/crypto/ec/curve448/curve448_lcl.h b/crypto/ec/curve448/curve448_local.h similarity index 100% rename from crypto/ec/curve448/curve448_lcl.h rename to crypto/ec/curve448/curve448_local.h diff --git a/crypto/ec/curve448/eddsa.c b/crypto/ec/curve448/eddsa.c index b28f7dff9138674a75016e273e6350735ce83e61..cd018c3db1262fcfadee5e6413fd06ca41171632 100644 --- a/crypto/ec/curve448/eddsa.c +++ b/crypto/ec/curve448/eddsa.c @@ -12,7 +12,7 @@ #include #include #include -#include "curve448_lcl.h" +#include "curve448_local.h" #include "word.h" #include "ed448.h" #include "internal/numbers.h" diff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h index d96d4c023d446f291d99f0d81d08ae5fa3c2cf54..8d046da5c601487945d8510a60845ad39164012e 100644 --- a/crypto/ec/curve448/field.h +++ b/crypto/ec/curve448/field.h @@ -13,7 +13,7 @@ #ifndef HEADER_FIELD_H # define HEADER_FIELD_H -# include "internal/constant_time_locl.h" +# include "internal/constant_time.h" # include # include # include "word.h" diff --git a/crypto/ec/ec2_oct.c b/crypto/ec/ec2_oct.c index ee300518d69c95ba5a227ded69fa6b8724797387..48543265eeabb782906e6c0dc39211059107514f 100644 --- a/crypto/ec/ec2_oct.c +++ b/crypto/ec/ec2_oct.c @@ -10,7 +10,7 @@ #include -#include "ec_lcl.h" +#include "ec_local.h" #ifndef OPENSSL_NO_EC2M diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c index 99ba7c13c57a859edad81bff62eb8be56d6b533d..84e5537a034a12ed144319ce3bbea506516c27df 100644 --- a/crypto/ec/ec2_smpl.c +++ b/crypto/ec/ec2_smpl.c @@ -11,7 +11,7 @@ #include #include "crypto/bn.h" -#include "ec_lcl.h" +#include "ec_local.h" #ifndef OPENSSL_NO_EC2M diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 3bd66c400c5e878106e228d3e3fc9e02504eda17..2210383739218e17c8a12dca07fc5048ce3db632 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -16,7 +16,7 @@ #include #include "crypto/asn1.h" #include "crypto/evp.h" -#include "ec_lcl.h" +#include "ec_local.h" #ifndef OPENSSL_NO_CMS static int ecdh_cms_decrypt(CMS_RecipientInfo *ri); diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c index 7cbf8de98130ec3a9962a1c013afbb90853b7a56..f14d1b5249603309102ba8914e497bbedc7c8dbd 100644 --- a/crypto/ec/ec_asn1.c +++ b/crypto/ec/ec_asn1.c @@ -8,7 +8,7 @@ */ #include -#include "ec_lcl.h" +#include "ec_local.h" #include #include #include diff --git a/crypto/ec/ec_check.c b/crypto/ec/ec_check.c index eeb06ec1cbe306db63e903b279341a6fc1855396..d0706d2857e69bce78127c0d405500391a6bef78 100644 --- a/crypto/ec/ec_check.c +++ b/crypto/ec/ec_check.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "ec_lcl.h" +#include "ec_local.h" #include int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx) diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c index 477349d4413e1aca51ece382bbcd4d7e1635bad2..8de486cbd763e07eae107ac27293f7559b65fa2b 100644 --- a/crypto/ec/ec_curve.c +++ b/crypto/ec/ec_curve.c @@ -9,7 +9,7 @@ */ #include -#include "ec_lcl.h" +#include "ec_local.h" #include #include #include diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c index 0ec346c125ade10edcdf468a1bf731a6645fdb05..944e317d9d140927a5d5823b435b16f3bb94b6e0 100644 --- a/crypto/ec/ec_cvt.c +++ b/crypto/ec/ec_cvt.c @@ -9,7 +9,7 @@ */ #include -#include "ec_lcl.h" +#include "ec_local.h" EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx) diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c index 9349abf03079fefd12c72b806a2d589da4f7c8b1..08aaac5d8a6f5ce8ed4971484a05b3f0deb851f3 100644 --- a/crypto/ec/ec_key.c +++ b/crypto/ec/ec_key.c @@ -10,7 +10,7 @@ #include "internal/cryptlib.h" #include -#include "ec_lcl.h" +#include "ec_local.h" #include "internal/refcount.h" #include #include diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c index 64a5d20872e446e476962309afd208688796c516..53a4a9295201a0702c82f05197ccce4a079fa3d9 100644 --- a/crypto/ec/ec_kmeth.c +++ b/crypto/ec/ec_kmeth.c @@ -11,7 +11,7 @@ #include #include #include -#include "ec_lcl.h" +#include "ec_local.h" static const EC_KEY_METHOD openssl_ec_key_method = { diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c index 1289c8608eddfb4a4453c195e6d1865f599595c0..3554ada82797b987cf57986b935a06e2ae8e0ad4 100644 --- a/crypto/ec/ec_lib.c +++ b/crypto/ec/ec_lib.c @@ -13,7 +13,7 @@ #include #include -#include "ec_lcl.h" +#include "ec_local.h" /* functions for EC_GROUP objects */ diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_local.h similarity index 100% rename from crypto/ec/ec_lcl.h rename to crypto/ec/ec_local.h diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c index 13fd5b1a33bf7000521fe1fc766235a52270b30b..7980a6728288d87791e221d72dcb0911faa3a579 100644 --- a/crypto/ec/ec_mult.c +++ b/crypto/ec/ec_mult.c @@ -13,7 +13,7 @@ #include "internal/cryptlib.h" #include "crypto/bn.h" -#include "ec_lcl.h" +#include "ec_local.h" #include "internal/refcount.h" /* diff --git a/crypto/ec/ec_oct.c b/crypto/ec/ec_oct.c index 522f79e67360d79c7df379b8b1fbd2078e5c95c9..7ddc86b047ca8a6ef7503f9556d2b82cbd02c473 100644 --- a/crypto/ec/ec_oct.c +++ b/crypto/ec/ec_oct.c @@ -13,7 +13,7 @@ #include #include -#include "ec_lcl.h" +#include "ec_local.h" int EC_POINT_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point, const BIGNUM *x, int y_bit, BN_CTX *ctx) diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c index b7d5cdf3103365c5788146bc13f94d3578f67556..64d2cc93a6201511d051b3f8d880781932bec45c 100644 --- a/crypto/ec/ec_pmeth.c +++ b/crypto/ec/ec_pmeth.c @@ -12,7 +12,7 @@ #include #include #include -#include "ec_lcl.h" +#include "ec_local.h" #include #include "crypto/evp.h" diff --git a/crypto/ec/ec_print.c b/crypto/ec/ec_print.c index 027a51928aab85d2adbfef616ddf45da5cbf56ab..f2525cbaa63d7e4508302a02586904257c4d78ef 100644 --- a/crypto/ec/ec_print.c +++ b/crypto/ec/ec_print.c @@ -9,7 +9,7 @@ #include #include -#include "ec_lcl.h" +#include "ec_local.h" BIGNUM *EC_POINT_point2bn(const EC_GROUP *group, const EC_POINT *point, diff --git a/crypto/ec/ecdh_kdf.c b/crypto/ec/ecdh_kdf.c index d686f9d897df1afd4af72de4fd2fe0314b40929a..96efac62f66f279a0c43d40beeff0a579a46fc12 100644 --- a/crypto/ec/ecdh_kdf.c +++ b/crypto/ec/ecdh_kdf.c @@ -10,7 +10,7 @@ #include #include #include -#include "ec_lcl.h" +#include "ec_local.h" /* Key derivation function from X9.63/SECG */ /* Way more than we will ever need */ diff --git a/crypto/ec/ecdh_ossl.c b/crypto/ec/ecdh_ossl.c index ab51ee7138ff8928fe534ffbe310edbb5c283961..0be00d43da4e013f675df0694746e729acba0ebd 100644 --- a/crypto/ec/ecdh_ossl.c +++ b/crypto/ec/ecdh_ossl.c @@ -17,7 +17,7 @@ #include #include #include -#include "ec_lcl.h" +#include "ec_local.h" int ossl_ecdh_compute_key(unsigned char **psec, size_t *pseclen, const EC_POINT *pub_key, const EC_KEY *ecdh) diff --git a/crypto/ec/ecdsa_ossl.c b/crypto/ec/ecdsa_ossl.c index f21a6899023998404d8080e55823f2bec0be6064..c6158616a2f54fe188f794aaddcc0860a3491f95 100644 --- a/crypto/ec/ecdsa_ossl.c +++ b/crypto/ec/ecdsa_ossl.c @@ -12,7 +12,7 @@ #include #include #include "crypto/bn.h" -#include "ec_lcl.h" +#include "ec_local.h" int ossl_ecdsa_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig, unsigned int *siglen, diff --git a/crypto/ec/ecdsa_sign.c b/crypto/ec/ecdsa_sign.c index aee06e991bada0356ffcde106886e05abaf99280..dc79c8c8e3dffa73a19108eab2fd1f00e4224353 100644 --- a/crypto/ec/ecdsa_sign.c +++ b/crypto/ec/ecdsa_sign.c @@ -8,7 +8,7 @@ */ #include -#include "ec_lcl.h" +#include "ec_local.h" #include ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dlen, EC_KEY *eckey) diff --git a/crypto/ec/ecdsa_vrf.c b/crypto/ec/ecdsa_vrf.c index f61a20063e4b51e2599cefdfbd1598b835df7168..3b7b4b3e07a1477135efae61b47a11a035712bef 100644 --- a/crypto/ec/ecdsa_vrf.c +++ b/crypto/ec/ecdsa_vrf.c @@ -8,7 +8,7 @@ */ #include -#include "ec_lcl.h" +#include "ec_local.h" #include /*- diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c index 252e66ef3791cbf2cf1061fa14de70a6a35c62d0..bdc39d5efb0ef3ca49b309321b8e58500d8fdc28 100644 --- a/crypto/ec/ecp_mont.c +++ b/crypto/ec/ecp_mont.c @@ -10,7 +10,7 @@ #include -#include "ec_lcl.h" +#include "ec_local.h" const EC_METHOD *EC_GFp_mont_method(void) { diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c index 5eaa99d8402b6c3325de017124e20f4d416dda8f..9fd01279a891141d6995cb8c533b43830f35a3de 100644 --- a/crypto/ec/ecp_nist.c +++ b/crypto/ec/ecp_nist.c @@ -12,7 +12,7 @@ #include #include -#include "ec_lcl.h" +#include "ec_local.h" const EC_METHOD *EC_GFp_nist_method(void) { diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c index fbbdb9d9386cbf80a9f0a23f39b5efd8be920985..36edcd513031962210ec6ed1f8ad5d74b9c34e36 100644 --- a/crypto/ec/ecp_nistp224.c +++ b/crypto/ec/ecp_nistp224.c @@ -38,7 +38,7 @@ NON_EMPTY_TRANSLATION_UNIT # include # include # include -# include "ec_lcl.h" +# include "ec_local.h" # if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16 /* even with gcc, the typedef won't work for 32-bit platforms */ diff --git a/crypto/ec/ecp_nistp256.c b/crypto/ec/ecp_nistp256.c index 22ba69aa44bae8345ee2f37ca13f6807a2c3ab6a..8265d574dec38c177550c802651eb98535476a52 100644 --- a/crypto/ec/ecp_nistp256.c +++ b/crypto/ec/ecp_nistp256.c @@ -39,7 +39,7 @@ NON_EMPTY_TRANSLATION_UNIT # include # include # include -# include "ec_lcl.h" +# include "ec_local.h" # if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16 /* even with gcc, the typedef won't work for 32-bit platforms */ diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c index 6340f48279374e7741451705c2873053c137367e..14cd40916266b5d3f0e49a390bf4ce3f9b9b61dd 100644 --- a/crypto/ec/ecp_nistp521.c +++ b/crypto/ec/ecp_nistp521.c @@ -38,7 +38,7 @@ NON_EMPTY_TRANSLATION_UNIT # include # include -# include "ec_lcl.h" +# include "ec_local.h" # if defined(__SIZEOF_INT128__) && __SIZEOF_INT128__==16 /* even with gcc, the typedef won't work for 32-bit platforms */ diff --git a/crypto/ec/ecp_nistputil.c b/crypto/ec/ecp_nistputil.c index f89a2f0aacc1884807a62bbb6d709092222e2f0b..60e1325c340fd47ee2a8fea85bd84a3571814cf5 100644 --- a/crypto/ec/ecp_nistputil.c +++ b/crypto/ec/ecp_nistputil.c @@ -33,7 +33,7 @@ NON_EMPTY_TRANSLATION_UNIT */ # include -# include "ec_lcl.h" +# include "ec_local.h" /* * Convert an array of points into affine coordinates. (If the point at diff --git a/crypto/ec/ecp_nistz256.c b/crypto/ec/ecp_nistz256.c index 43becb2fecb43fdc04c39884f5c3ba2de828a9f9..6da62c3b91d8069d0b7cfe8a9faeecce70971fef 100644 --- a/crypto/ec/ecp_nistz256.c +++ b/crypto/ec/ecp_nistz256.c @@ -22,7 +22,7 @@ #include "internal/cryptlib.h" #include "crypto/bn.h" -#include "ec_lcl.h" +#include "ec_local.h" #include "internal/refcount.h" #if BN_BITS2 != 64 diff --git a/crypto/ec/ecp_oct.c b/crypto/ec/ecp_oct.c index 7ade1b3d2173219e40d38982c5483b3213675fbf..9460763256fdf6fa69e0f961a24066e92639fd69 100644 --- a/crypto/ec/ecp_oct.c +++ b/crypto/ec/ecp_oct.c @@ -11,7 +11,7 @@ #include #include -#include "ec_lcl.h" +#include "ec_local.h" int ec_GFp_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point, diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c index e6e4c9d2cbb76e051ec0e441c02b9fd96dbc804b..b354bfe9ce9ee4747eb19eef3a83f7c48d953500 100644 --- a/crypto/ec/ecp_smpl.c +++ b/crypto/ec/ecp_smpl.c @@ -11,7 +11,7 @@ #include #include -#include "ec_lcl.h" +#include "ec_local.h" const EC_METHOD *EC_GFp_simple_method(void) { diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c index 0504831b111f02570ad1273754601f94a66d8ace..9dc5259e4afc8b6aa618aa75d58843e76286a7d3 100644 --- a/crypto/ec/ecx_meth.c +++ b/crypto/ec/ecx_meth.c @@ -14,8 +14,8 @@ #include #include "crypto/asn1.h" #include "crypto/evp.h" -#include "ec_lcl.h" -#include "curve448/curve448_lcl.h" +#include "ec_local.h" +#include "curve448/curve448_local.h" #define X25519_BITS 253 #define X25519_SECURITY_BITS 128 diff --git a/crypto/engine/README b/crypto/engine/README index c7a5696ca14cd7a4330a70530b8983741e962c7f..0f8a8fbde41032cd03a8700430efa567799ec065 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 af306ccffc12a909d008e50bd680c0b94a4ce5d2..b675ed7892e27389d0095834b10bda0adeb2dddf 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 6f0a066d06d1cf6e3859a2c5dbf32346dc1f66e3..df00df6acd61f31088d2407daf6de459d4715651 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 /* #define ENGINE_CONF_DEBUG */ diff --git a/crypto/engine/eng_ctrl.c b/crypto/engine/eng_ctrl.c index 3bc4aab16feda64822abc43bdc692701413e1c6c..e65e78447b43beb7d3b0799a463d6c4dd3821c7d 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 843226c077db2f6b2d38b816f82bb8acc382370c..06e677290a700b47dca493d422bc418fbb1e7f59 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 diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c index 591fddc8e4fb6c048ade711c832bdd36cadc61ec..fe231a65f658bae0469c1393e259b35dea4cad7c 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 int ENGINE_set_default(ENGINE *e, unsigned int flags) diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c index 7c235fc472a24688d91eb770c5a5a394230d40ca..6c9063f8f681646c958dea3ffa55e457bc34dce9 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 d7f2026fac546cb143a319e1cab7afd138d920ae..b851ff69575684552625f7a66003567d7b3fec06 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 #include "internal/refcount.h" diff --git a/crypto/engine/eng_list.c b/crypto/engine/eng_list.c index 45c339c54157a432ffc66cbf4cec4c910b2a2444..1352fb7c961d83dbae0872194f747bb144b533cd 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 similarity index 100% rename from crypto/engine/eng_int.h rename to crypto/engine/eng_local.h diff --git a/crypto/engine/eng_pkey.c b/crypto/engine/eng_pkey.c index 305a648feb6ad588e903712d20550c9ab10137ea..e813bc6db0e6e8da20a6f3ca76cae017c48495d3 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 ac4b02fc12a8930b30e501d158f0d23ea20b14a2..72f393dbe143e318f365e5e0da768fa38a338eda 100644 --- a/crypto/engine/eng_table.c +++ b/crypto/engine/eng_table.c @@ -10,7 +10,7 @@ #include "internal/cryptlib.h" #include #include -#include "eng_int.h" +#include "eng_local.h" /* The type of the items in the table */ struct st_engine_pile { @@ -26,7 +26,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 */ @@ -76,7 +76,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 9c7e73d65ffc2e936a5bc5df814d80efce056cce..130b289fecb05b3e240c2c63e0b0d1f86cfc24fc 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 #include "crypto/asn1.h" diff --git a/crypto/engine/tb_cipher.c b/crypto/engine/tb_cipher.c index faa967c475f5df3b17720e834181e173c8dc731a..236da346cd4c62f3a9519aeaa1098b794140e0b9 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 785119f65af9debf75cf751c9731082b42f2fa55..a13a13950083f5ff8d28e8edf5ffbf095e296709 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 d644b1b0a825b2142b2899713e59a731f3951d7e..a6e6337a01d9155f52ab50006b600a4b9eb7c8ef 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 65b6ea8d3a0ef1160392f40fe78f00c2552ebae1..2c77f0f3e151b976f864162089cf7020b09d276c 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 1e50736854107de48befa976cd9702f3a635167e..907d55ae8c44e215bf8a89010ffda4afe1b862ba 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 03cd1e69dd6decf9da80d63f7eb83b2cac7a7101..c5c001c5cbecd5d8941255a381f704f8ee68dc95 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 static ENGINE_TABLE *pkey_meth_table = NULL; diff --git a/crypto/engine/tb_rand.c b/crypto/engine/tb_rand.c index 98a98073cdd0d8f8f2c28123b5ef9eaa9d66265b..92f61c5a88401946de5aa20ade524c4fcef2f9d9 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 d8d2e34f848bec8638b53584d111648fb2964e3a..43e865e6d6d14e59c56fdedd572202e1aea971c8 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; diff --git a/crypto/err/err.c b/crypto/err/err.c index ec8a7851afdf7a7226ddc5d589cabafe32d7fe52..1372d52f80ee4b245b79dd4a6909b9fe6c4c09e5 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -20,7 +20,7 @@ #include #include "internal/thread_once.h" #include "crypto/ctype.h" -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" #include "e_os.h" static int err_load_strings(const ERR_STRING_DATA *str); diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec index f9f8c404c35910f2963defab1ee724d78c664706..5976d1501f562f294b19a965c2e7b5f158289661 100644 --- a/crypto/err/openssl.ec +++ b/crypto/err/openssl.ec @@ -37,10 +37,10 @@ L OSSL_STORE include/openssl/store.h crypto/store/store_err.c # additional header files to be scanned for function names L NONE include/openssl/x509_vfy.h NONE -L NONE crypto/ec/ec_lcl.h NONE -L NONE crypto/cms/cms_lcl.h NONE -L NONE crypto/ct/ct_locl.h NONE -L NONE ssl/ssl_locl.h NONE +L NONE crypto/ec/ec_local.h NONE +L NONE crypto/cms/cms_local.h NONE +L NONE crypto/ct/ct_local.h NONE +L NONE ssl/ssl_local.h NONE # SSL/TLS alerts R SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE 1010 diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c index 6a78c359a1bddeba6c42d89015fc64da8e5543f8..fed4cf1eb1ff5d0e9886f1e4e618c4e51db62000 100644 --- a/crypto/evp/bio_md.c +++ b/crypto/evp/bio_md.c @@ -13,7 +13,7 @@ #include #include #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" #include "internal/bio.h" /* diff --git a/crypto/evp/cmeth_lib.c b/crypto/evp/cmeth_lib.c index d635dfca4e383a3cbf19c41afbc6ea5de51c9b7a..272e48249e421e50a8ee878c1bd94292a806ccae 100644 --- a/crypto/evp/cmeth_lib.c +++ b/crypto/evp/cmeth_lib.c @@ -11,7 +11,7 @@ #include #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" EVP_CIPHER *EVP_CIPHER_meth_new(int cipher_type, int block_size, int key_len) { diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index d1b127a19d7d24aa6b8be0326b0f9ac0d91fede3..d1bfa274ca8125671281024c59c79f0a2995d78f 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -13,7 +13,7 @@ #include #include #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" /* This call frees resources associated with the context */ int EVP_MD_CTX_reset(EVP_MD_CTX *ctx) diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 046bc2745a7a9637d4ac61df1ffe81a638e5b914..1ca2c312a3c00feb636a1197b3066769d430c17c 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -15,9 +15,9 @@ #include #include #include "crypto/evp.h" -#include "modes_lcl.h" +#include "modes_local.h" #include -#include "evp_locl.h" +#include "evp_local.h" typedef struct { union { diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index 853c5f9c6f259a5535aa2268e1529d8e9489a32f..c9f5969162ce249ccad4d26e5029493ec03f6c46 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -17,9 +17,9 @@ #include #include #include -#include "modes_lcl.h" +#include "modes_local.h" #include "crypto/evp.h" -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" typedef struct { AES_KEY ks; diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index 570ec00bc635836dacb7411085f46f6ceea4b269..d5178313ae3ae331c61e4ea3a3330dd442d7f402 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -18,8 +18,8 @@ #include #include #include -#include "modes_lcl.h" -#include "internal/constant_time_locl.h" +#include "modes_local.h" +#include "internal/constant_time.h" #include "crypto/evp.h" typedef struct { diff --git a/crypto/evp/e_aria.c b/crypto/evp/e_aria.c index a6998bad542b6307d61b106115915fae80e5bed3..0bebbb6fc2e983808932552cbcc76208c825c7a9 100644 --- a/crypto/evp/e_aria.c +++ b/crypto/evp/e_aria.c @@ -16,8 +16,8 @@ # include # include "crypto/aria.h" # include "crypto/evp.h" -# include "modes_lcl.h" -# include "evp_locl.h" +# include "modes_local.h" +# include "evp_local.h" /* ARIA subkey Structure */ typedef struct { diff --git a/crypto/evp/e_camellia.c b/crypto/evp/e_camellia.c index d70d3964cf401884948478b81bfc03ce9933c01e..502d6936cc1307478691ffd5af0000dcbcddcc99 100644 --- a/crypto/evp/e_camellia.c +++ b/crypto/evp/e_camellia.c @@ -18,7 +18,7 @@ NON_EMPTY_TRANSLATION_UNIT # include # include # include "crypto/evp.h" -# include "modes_lcl.h" +# include "modes_local.h" static int camellia_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc); diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c index 5d7dca3ba6d31dd29cd396578908d62093460c0a..bdc406bb69dc27bbbd9bfa263c890dd7fc5cd059 100644 --- a/crypto/evp/e_chacha20_poly1305.c +++ b/crypto/evp/e_chacha20_poly1305.c @@ -14,7 +14,7 @@ # include # include -# include "evp_locl.h" +# include "evp_local.h" # include "crypto/evp.h" # include "crypto/chacha.h" diff --git a/crypto/evp/e_des3.c b/crypto/evp/e_des3.c index bb426bd9b4c315faa8c0b4a177723e5be3eb2f4a..2a5597fee527ec343774485ab47a05ad2e71f92f 100644 --- a/crypto/evp/e_des3.c +++ b/crypto/evp/e_des3.c @@ -15,7 +15,7 @@ # include "crypto/evp.h" # include # include -# include "evp_locl.h" +# include "evp_local.h" typedef struct { union { diff --git a/crypto/evp/e_rc5.c b/crypto/evp/e_rc5.c index a10533919098f986201d5a325042d220dca83a8d..c86e87b65ab4ad450c8d22fb1d696cbc25462273 100644 --- a/crypto/evp/e_rc5.c +++ b/crypto/evp/e_rc5.c @@ -15,7 +15,7 @@ # include # include "crypto/evp.h" # include -# include "evp_locl.h" +# include "evp_local.h" # include static int r_32_12_16_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c index e70f80f5c95addd1310821007deaa6cb330e7882..9307ff0464249754ef331ba78ac741e78acbb19a 100644 --- a/crypto/evp/encode.c +++ b/crypto/evp/encode.c @@ -11,7 +11,7 @@ #include #include "internal/cryptlib.h" #include -#include "evp_locl.h" +#include "evp_local.h" #include "crypto/evp.h" static unsigned char conv_ascii2bin(unsigned char a, diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index ddf3045f56bc8127a9feecbadf8d433097e1f362..08bd209dd84e371b5cd0f6994a9bc26ba1d4c26a 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -16,7 +16,7 @@ #include #include #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c) { diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index 1931e5a3a97dc02febc356b891acf061644bf796..45cde0da8bfc9039aef5a39445b27c966a9af340 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -12,7 +12,7 @@ #include #include #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type) { diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_local.h similarity index 100% rename from crypto/evp/evp_locl.h rename to crypto/evp/evp_local.h diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index 5a88817b4aa91c4e9f506caae257b1ea7ec086a8..967203f373c9bd19f1e4260e5983adbef8d49b14 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -12,7 +12,7 @@ #include #include #include -#include "evp_locl.h" +#include "evp_local.h" /* Password based encryption (PBE) functions */ diff --git a/crypto/evp/m_sha3.c b/crypto/evp/m_sha3.c index e0f8e9e416a3e8f7e46985821cf2289fbffe9951..54c592a3cce249bde2e49c8400983e01a91cc2b0 100644 --- a/crypto/evp/m_sha3.c +++ b/crypto/evp/m_sha3.c @@ -13,7 +13,7 @@ #include #include #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len, size_t r); diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c index e16546f7e098fcf8116433f1aa94d27795883c4d..04643acc8837ef5515822276342762a9b3c6ac51 100644 --- a/crypto/evp/m_sigver.c +++ b/crypto/evp/m_sigver.c @@ -13,7 +13,7 @@ #include #include #include "crypto/evp.h" -#include "evp_locl.h" +#include "evp_local.h" static int update(EVP_MD_CTX *ctx, const void *data, size_t datalen) { diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index e819eb9b47dcb41f0ce4865bf6979f4038c7d646..7f625b3d57f3ff820ed29e7fc42bbf1a5be89bd3 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -13,7 +13,7 @@ # include # include # include -# include "evp_locl.h" +# include "evp_local.h" /* set this to print out info about the keygen algorithm */ /* #define OPENSSL_DEBUG_PKCS5V2 */ diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c index 0c0a7133fb5aa927fc31e83aee1b3f1d1f355494..51dd91237cf6cf7a88fa288c25b5941359707390 100644 --- a/crypto/hmac/hmac.c +++ b/crypto/hmac/hmac.c @@ -13,7 +13,7 @@ #include "internal/cryptlib.h" #include #include -#include "hmac_lcl.h" +#include "hmac_local.h" int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md, ENGINE *impl) diff --git a/crypto/hmac/hmac_lcl.h b/crypto/hmac/hmac_local.h similarity index 100% rename from crypto/hmac/hmac_lcl.h rename to crypto/hmac/hmac_local.h diff --git a/crypto/idea/i_cbc.c b/crypto/idea/i_cbc.c index a70a8682a7801dacc2ba2e258056f81cb4532f3e..4eff467111be14c5f434350072020f04751e885a 100644 --- a/crypto/idea/i_cbc.c +++ b/crypto/idea/i_cbc.c @@ -8,7 +8,7 @@ */ #include -#include "idea_lcl.h" +#include "idea_local.h" void IDEA_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, diff --git a/crypto/idea/i_cfb64.c b/crypto/idea/i_cfb64.c index daf467eb5c26e26f6248ef7899201d259dd288dd..61c723015b990108f47499b3f41d073d007144aa 100644 --- a/crypto/idea/i_cfb64.c +++ b/crypto/idea/i_cfb64.c @@ -8,7 +8,7 @@ */ #include -#include "idea_lcl.h" +#include "idea_local.h" /* * The input and output encrypted as though 64bit cfb mode is being used. diff --git a/crypto/idea/i_ecb.c b/crypto/idea/i_ecb.c index 058d0c14c005ab860784191285bf9061fef650ce..cb724e1a6c0b1ab25baf3facf70e809173dd93ca 100644 --- a/crypto/idea/i_ecb.c +++ b/crypto/idea/i_ecb.c @@ -8,7 +8,7 @@ */ #include -#include "idea_lcl.h" +#include "idea_local.h" #include const char *IDEA_options(void) diff --git a/crypto/idea/i_ofb64.c b/crypto/idea/i_ofb64.c index 997a7b88edf4f98d365483bc592a20fc63ec5362..f000ced58620bcf910deba5c9769b44a8dcc0b70 100644 --- a/crypto/idea/i_ofb64.c +++ b/crypto/idea/i_ofb64.c @@ -8,7 +8,7 @@ */ #include -#include "idea_lcl.h" +#include "idea_local.h" /* * The input and output encrypted as though 64bit ofb mode is being used. diff --git a/crypto/idea/i_skey.c b/crypto/idea/i_skey.c index 9d9145580fcf213f5f5a4ebade87fe94bfedcb3d..230338d7e3ab6b0be073dfc1d0984bc0f9ccbf42 100644 --- a/crypto/idea/i_skey.c +++ b/crypto/idea/i_skey.c @@ -8,7 +8,7 @@ */ #include -#include "idea_lcl.h" +#include "idea_local.h" static IDEA_INT inverse(unsigned int xin); void IDEA_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks) diff --git a/crypto/idea/idea_lcl.h b/crypto/idea/idea_local.h similarity index 100% rename from crypto/idea/idea_lcl.h rename to crypto/idea/idea_local.h diff --git a/crypto/lhash/lh_stats.c b/crypto/lhash/lh_stats.c index 65b91e1ef415e620b68f127f6f5fe6074d23b0ea..45f1b105554f1c66786a4d11e51ff84eaace7fb2 100644 --- a/crypto/lhash/lh_stats.c +++ b/crypto/lhash/lh_stats.c @@ -18,7 +18,7 @@ #include #include -#include "lhash_lcl.h" +#include "lhash_local.h" # ifndef OPENSSL_NO_STDIO void OPENSSL_LH_stats(const OPENSSL_LHASH *lh, FILE *fp) diff --git a/crypto/lhash/lhash.c b/crypto/lhash/lhash.c index 65e73226ae75d72ddd68c2d8f70f37fbf3d225f5..9dc887d91e4b253d40e3e49a45b840d781291189 100644 --- a/crypto/lhash/lhash.c +++ b/crypto/lhash/lhash.c @@ -15,7 +15,7 @@ #include #include "crypto/ctype.h" #include "crypto/lhash.h" -#include "lhash_lcl.h" +#include "lhash_local.h" /* * A hashing implementation that appears to be based on the linear hashing diff --git a/crypto/lhash/lhash_lcl.h b/crypto/lhash/lhash_local.h similarity index 100% rename from crypto/lhash/lhash_lcl.h rename to crypto/lhash/lhash_local.h diff --git a/crypto/md4/md4_dgst.c b/crypto/md4/md4_dgst.c index 5319618615e3ddabc54aaf73982adba3186e6d71..29b6b252bae3fe8f05e2fb139d88e53a81933bfe 100644 --- a/crypto/md4/md4_dgst.c +++ b/crypto/md4/md4_dgst.c @@ -9,7 +9,7 @@ #include #include -#include "md4_locl.h" +#include "md4_local.h" /* * Implemented from RFC1186 The MD4 Message-Digest Algorithm @@ -39,7 +39,7 @@ void md4_block_data_order(MD4_CTX *c, const void *data_, size_t num) const unsigned char *data = data_; register unsigned MD32_REG_T A, B, C, D, l; # ifndef MD32_XARRAY - /* See comment in crypto/sha/sha_locl.h for details. */ + /* See comment in crypto/sha/sha_local.h for details. */ unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7, XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15; # define X(i) XX##i diff --git a/crypto/md4/md4_locl.h b/crypto/md4/md4_local.h similarity index 100% rename from crypto/md4/md4_locl.h rename to crypto/md4/md4_local.h diff --git a/crypto/md5/md5_dgst.c b/crypto/md5/md5_dgst.c index fbede6742af6ada0ebb848746380045fd0c2139f..d84cba37ae984d62325cfd81831b7742a78945a1 100644 --- a/crypto/md5/md5_dgst.c +++ b/crypto/md5/md5_dgst.c @@ -8,7 +8,7 @@ */ #include -#include "md5_locl.h" +#include "md5_local.h" #include /* @@ -39,7 +39,7 @@ void md5_block_data_order(MD5_CTX *c, const void *data_, size_t num) const unsigned char *data = data_; register unsigned MD32_REG_T A, B, C, D, l; # ifndef MD32_XARRAY - /* See comment in crypto/sha/sha_locl.h for details. */ + /* See comment in crypto/sha/sha_local.h for details. */ unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7, XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15; # define X(i) XX##i diff --git a/crypto/md5/md5_locl.h b/crypto/md5/md5_local.h similarity index 100% rename from crypto/md5/md5_locl.h rename to crypto/md5/md5_local.h diff --git a/crypto/modes/cbc128.c b/crypto/modes/cbc128.c index 4ce5eb2ae341841a36c9a29dbe11aff262d2c20d..fc7e0b60510b03346f4a9ad08ff5b28e7078b798 100644 --- a/crypto/modes/cbc128.c +++ b/crypto/modes/cbc128.c @@ -8,7 +8,7 @@ */ #include -#include "modes_lcl.h" +#include "modes_local.h" #include #if !defined(STRICT_ALIGNMENT) && !defined(PEDANTIC) diff --git a/crypto/modes/ccm128.c b/crypto/modes/ccm128.c index 05a33239f56e2a377ccc73ff980d886363088826..424722811c16cc58e0aea38f77f2480213104642 100644 --- a/crypto/modes/ccm128.c +++ b/crypto/modes/ccm128.c @@ -8,7 +8,7 @@ */ #include -#include "modes_lcl.h" +#include "modes_local.h" #include /* diff --git a/crypto/modes/cfb128.c b/crypto/modes/cfb128.c index e439567fe59f31e3247ab6180aebeb795bb9406b..b6bec414a966f66f8d8e2c49820c9256514c018c 100644 --- a/crypto/modes/cfb128.c +++ b/crypto/modes/cfb128.c @@ -8,7 +8,7 @@ */ #include -#include "modes_lcl.h" +#include "modes_local.h" #include /* diff --git a/crypto/modes/ctr128.c b/crypto/modes/ctr128.c index 03920b447333eaef3ce68dced46d0bccc5aa3568..ae35116e952411f3dcb01a23309155913bee909a 100644 --- a/crypto/modes/ctr128.c +++ b/crypto/modes/ctr128.c @@ -8,7 +8,7 @@ */ #include -#include "modes_lcl.h" +#include "modes_local.h" #include /* diff --git a/crypto/modes/cts128.c b/crypto/modes/cts128.c index 93826a1e2f06c8b10d80892c2c777671018dc648..9052e857764fe7d03f7926225c85d2d094cc5ad0 100644 --- a/crypto/modes/cts128.c +++ b/crypto/modes/cts128.c @@ -8,7 +8,7 @@ */ #include -#include "modes_lcl.h" +#include "modes_local.h" #include /* diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c index 15f76e3e86bc778b34fa7635c51d809943f988b1..48775e6d05ffbf2ed10b01a572b4d471b2747549 100644 --- a/crypto/modes/gcm128.c +++ b/crypto/modes/gcm128.c @@ -8,7 +8,7 @@ */ #include -#include "modes_lcl.h" +#include "modes_local.h" #include #if defined(BSWAP4) && defined(STRICT_ALIGNMENT) diff --git a/crypto/modes/modes_lcl.h b/crypto/modes/modes_local.h similarity index 100% rename from crypto/modes/modes_lcl.h rename to crypto/modes/modes_local.h diff --git a/crypto/modes/ocb128.c b/crypto/modes/ocb128.c index 713b9aaf19d5ff7023887f4882cc83c97a12005b..b39a55a1a1459eaafae3956fbb280e9b7bdf2285 100644 --- a/crypto/modes/ocb128.c +++ b/crypto/modes/ocb128.c @@ -10,7 +10,7 @@ #include #include #include -#include "modes_lcl.h" +#include "modes_local.h" #ifndef OPENSSL_NO_OCB diff --git a/crypto/modes/ofb128.c b/crypto/modes/ofb128.c index 83092564c6b6c08ca288d92d0fc3ba80bfbaf0eb..44bdf888db1a18c88f5b818484cc7091553fba83 100644 --- a/crypto/modes/ofb128.c +++ b/crypto/modes/ofb128.c @@ -8,7 +8,7 @@ */ #include -#include "modes_lcl.h" +#include "modes_local.h" #include /* diff --git a/crypto/modes/xts128.c b/crypto/modes/xts128.c index 81b1eacd5920063d074fc5c13049ae9e2d3bb863..b5bda5e6402d966ac55cddc98012f51c1ae72cb7 100644 --- a/crypto/modes/xts128.c +++ b/crypto/modes/xts128.c @@ -8,7 +8,7 @@ */ #include -#include "modes_lcl.h" +#include "modes_local.h" #include int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx, diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index e04a075977f32e62af367c9aa9dea81887de2f34..979d83577c22a1fcaabaf7116264644e47fc71ee 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -18,7 +18,7 @@ #include #include "internal/thread_once.h" #include "crypto/lhash.h" -#include "obj_lcl.h" +#include "obj_local.h" #include "e_os.h" /* diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index 6e6b9c373bbc30989d5fedb1ac4238838ecabc6a..46006fe6cf9c4636645efe5678ac4e012933a01a 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -16,7 +16,7 @@ #include "crypto/objects.h" #include #include "crypto/asn1.h" -#include "obj_lcl.h" +#include "obj_local.h" /* obj_dat.h is generated from objects.h by obj_dat.pl */ #include "obj_dat.h" diff --git a/crypto/objects/obj_lcl.h b/crypto/objects/obj_local.h similarity index 100% rename from crypto/objects/obj_lcl.h rename to crypto/objects/obj_local.h diff --git a/crypto/ocsp/ocsp_asn.c b/crypto/ocsp/ocsp_asn.c index 1e0b82797bdca7f6af397c85cc8ab73a263da618..a869e32bc8b3532a897866ddff9ca3e7caf6e6c8 100644 --- a/crypto/ocsp/ocsp_asn.c +++ b/crypto/ocsp/ocsp_asn.c @@ -10,7 +10,7 @@ #include #include #include -#include "ocsp_lcl.h" +#include "ocsp_local.h" ASN1_SEQUENCE(OCSP_SIGNATURE) = { ASN1_EMBED(OCSP_SIGNATURE, signatureAlgorithm, X509_ALGOR), diff --git a/crypto/ocsp/ocsp_cl.c b/crypto/ocsp/ocsp_cl.c index 739ac01807a07a413f56f6d9bfcbcc3381b2b25f..55ffd45c6ec032396eb0acdf6461476d9096cb95 100644 --- a/crypto/ocsp/ocsp_cl.c +++ b/crypto/ocsp/ocsp_cl.c @@ -16,7 +16,7 @@ #include #include #include -#include "ocsp_lcl.h" +#include "ocsp_local.h" /* * Utility functions related to sending OCSP requests and extracting relevant diff --git a/crypto/ocsp/ocsp_ext.c b/crypto/ocsp/ocsp_ext.c index 3ab5308a12bb1550b78381850bddcf661730d96b..f6c387ffb7d7ccb0bfeaa3b45ee8be1b321b3d1a 100644 --- a/crypto/ocsp/ocsp_ext.c +++ b/crypto/ocsp/ocsp_ext.c @@ -12,7 +12,7 @@ #include #include #include -#include "ocsp_lcl.h" +#include "ocsp_local.h" #include #include diff --git a/crypto/ocsp/ocsp_lib.c b/crypto/ocsp/ocsp_lib.c index b8b91cc9eb3f08212fe77972104eba61266ad50a..37ac6c03fd0448c21e222d4da308f38701c68c01 100644 --- a/crypto/ocsp/ocsp_lib.c +++ b/crypto/ocsp/ocsp_lib.c @@ -14,7 +14,7 @@ #include #include #include -#include "ocsp_lcl.h" +#include "ocsp_local.h" #include /* Convert a certificate and its issuer to an OCSP_CERTID */ diff --git a/crypto/ocsp/ocsp_lcl.h b/crypto/ocsp/ocsp_local.h similarity index 100% rename from crypto/ocsp/ocsp_lcl.h rename to crypto/ocsp/ocsp_local.h diff --git a/crypto/ocsp/ocsp_prn.c b/crypto/ocsp/ocsp_prn.c index 5605812ef74b375a3c59a42136851139c3180ee5..1965f2a183b32db8999ed858b1bd4b0fc19e268b 100644 --- a/crypto/ocsp/ocsp_prn.c +++ b/crypto/ocsp/ocsp_prn.c @@ -10,7 +10,7 @@ #include #include #include -#include "ocsp_lcl.h" +#include "ocsp_local.h" #include "internal/cryptlib.h" #include diff --git a/crypto/ocsp/ocsp_srv.c b/crypto/ocsp/ocsp_srv.c index 6bd6f7b6d8928330605ca14615869c106ae8053b..e35fc52fd94407f58102b66fc688664d69df0bdb 100644 --- a/crypto/ocsp/ocsp_srv.c +++ b/crypto/ocsp/ocsp_srv.c @@ -14,7 +14,7 @@ #include #include #include -#include "ocsp_lcl.h" +#include "ocsp_local.h" /* * Utility functions related to sending OCSP responses and extracting diff --git a/crypto/ocsp/ocsp_vfy.c b/crypto/ocsp/ocsp_vfy.c index 9a8d343866217eb0215856a9ef3f154a9dc9a0cc..e87b71c0c791635d7fae4d60c83aa30ceba00c76 100644 --- a/crypto/ocsp/ocsp_vfy.c +++ b/crypto/ocsp/ocsp_vfy.c @@ -8,7 +8,7 @@ */ #include -#include "ocsp_lcl.h" +#include "ocsp_local.h" #include #include diff --git a/crypto/ocsp/v3_ocsp.c b/crypto/ocsp/v3_ocsp.c index 2d425a8951d692145902b5d97133b79cdecccde0..a174ce15a60d57d5ca48d7e55b46d21b4668b197 100644 --- a/crypto/ocsp/v3_ocsp.c +++ b/crypto/ocsp/v3_ocsp.c @@ -12,7 +12,7 @@ # include # include # include -# include "ocsp_lcl.h" +# include "ocsp_local.h" # include # include "../x509v3/ext_dat.h" diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c index 193ed8097dc3fd37f996b836b6921890b514c394..af184c86af5dbf1d23f210f71af569d2d2da3470 100644 --- a/crypto/pkcs12/p12_add.c +++ b/crypto/pkcs12/p12_add.c @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include -#include "p12_lcl.h" +#include "p12_local.h" /* Pack an object into an OCTET STRING and turn into a safebag */ diff --git a/crypto/pkcs12/p12_asn.c b/crypto/pkcs12/p12_asn.c index 422dfc398fabc1bc8174d01e2fa7268c1ada0c6c..88f145890cf6e539eefd1e0289a75c04fac3e28a 100644 --- a/crypto/pkcs12/p12_asn.c +++ b/crypto/pkcs12/p12_asn.c @@ -11,7 +11,7 @@ #include "internal/cryptlib.h" #include #include -#include "p12_lcl.h" +#include "p12_local.h" /* PKCS#12 ASN1 module */ diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c index c324f50514698dc0c8351225b7794299386af106..a958fdf3465e620b9b7912955307b9c293cf0bfd 100644 --- a/crypto/pkcs12/p12_attr.c +++ b/crypto/pkcs12/p12_attr.c @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include -#include "p12_lcl.h" +#include "p12_local.h" /* Add a local keyid to a safebag */ diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c index 10cf8dd589d9d8e38d76339bfdc53090e981d7a3..d43dc3b30cf3a6f6d78132433630356a1a58b287 100644 --- a/crypto/pkcs12/p12_crt.c +++ b/crypto/pkcs12/p12_crt.c @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include -#include "p12_lcl.h" +#include "p12_local.h" static int pkcs12_add_bag(STACK_OF(PKCS12_SAFEBAG) **pbags, PKCS12_SAFEBAG *bag); diff --git a/crypto/pkcs12/p12_init.c b/crypto/pkcs12/p12_init.c index 88db0f2dc4f9f963a6e6f715f85174302516c08b..7ecc29ec0ce097cfe964230607afd79a1df87800 100644 --- a/crypto/pkcs12/p12_init.c +++ b/crypto/pkcs12/p12_init.c @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include -#include "p12_lcl.h" +#include "p12_local.h" /* Initialise a PKCS12 structure to take data */ diff --git a/crypto/pkcs12/p12_lcl.h b/crypto/pkcs12/p12_local.h similarity index 100% rename from crypto/pkcs12/p12_lcl.h rename to crypto/pkcs12/p12_local.h diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c index 0cbbed364a210d6e0db78f34830b64bc999fb4b8..3658003fe5981a9c04c28dc9ecba3d93800d4aea 100644 --- a/crypto/pkcs12/p12_mutl.c +++ b/crypto/pkcs12/p12_mutl.c @@ -13,7 +13,7 @@ #include #include #include -#include "p12_lcl.h" +#include "p12_local.h" int PKCS12_mac_present(const PKCS12 *p12) { diff --git a/crypto/pkcs12/p12_npas.c b/crypto/pkcs12/p12_npas.c index 0ce75ed330ee53307852514f099312e39cffb91c..0334289a89fa07dd23cdb1cae46d1b545a1d652d 100644 --- a/crypto/pkcs12/p12_npas.c +++ b/crypto/pkcs12/p12_npas.c @@ -13,7 +13,7 @@ #include #include #include -#include "p12_lcl.h" +#include "p12_local.h" /* PKCS#12 password change routine */ diff --git a/crypto/pkcs12/p12_sbag.c b/crypto/pkcs12/p12_sbag.c index a09c5b93132afeb60280d555c742a1fa0b583619..7cf522786b03ecc082667b798a8d9aec2754ad4c 100644 --- a/crypto/pkcs12/p12_sbag.c +++ b/crypto/pkcs12/p12_sbag.c @@ -10,7 +10,7 @@ #include #include "internal/cryptlib.h" #include -#include "p12_lcl.h" +#include "p12_local.h" #if OPENSSL_API_COMPAT < 0x10100000L ASN1_TYPE *PKCS12_get_attr(const PKCS12_SAFEBAG *bag, int attr_nid) diff --git a/crypto/poly1305/poly1305.c b/crypto/poly1305/poly1305.c index b01d0cfbd3db6cac7b26f0a0f5c595c00062305d..e7f5b92c8f3da7a339430866dd8da1987650e9fd 100644 --- a/crypto/poly1305/poly1305.c +++ b/crypto/poly1305/poly1305.c @@ -89,7 +89,7 @@ static void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len, u32 padbit); /* - * Type-agnostic "rip-off" from constant_time_locl.h + * Type-agnostic "rip-off" from constant_time.h */ # define CONSTANT_TIME_CARRY(a,b) ( \ (a ^ ((a ^ b) | ((a - b) ^ b))) >> (sizeof(a) * 8 - 1) \ diff --git a/crypto/ppccap.c b/crypto/ppccap.c index e4a1441978a0c209414016b8ad79872638105928..b12cd949ccfe1b70b1cd1ccbb763a262cc3c176e 100644 --- a/crypto/ppccap.c +++ b/crypto/ppccap.c @@ -30,7 +30,7 @@ #include #include #include -#include "bn/bn_lcl.h" +#include "bn/bn_local.h" #include "ppc_arch.h" diff --git a/crypto/rand/drbg_ctr.c b/crypto/rand/drbg_ctr.c index a243361b56e4010d1f1f1769ef1d3087f1cbe65a..93b82f34ceda1290f5ff6d073c6df56501e6d7d2 100644 --- a/crypto/rand/drbg_ctr.c +++ b/crypto/rand/drbg_ctr.c @@ -14,7 +14,7 @@ #include #include "internal/thread_once.h" #include "internal/thread_once.h" -#include "rand_lcl.h" +#include "rand_local.h" /* * Implementation of NIST SP 800-90A CTR DRBG. */ diff --git a/crypto/rand/drbg_lib.c b/crypto/rand/drbg_lib.c index 24fd6b2cbb5f0f75c2259c752aa8de61dbf08ea1..3af1d557c16091c06f285b492e7cfb6bd5758430 100644 --- a/crypto/rand/drbg_lib.c +++ b/crypto/rand/drbg_lib.c @@ -11,7 +11,7 @@ #include #include #include -#include "rand_lcl.h" +#include "rand_local.h" #include "internal/thread_once.h" #include "crypto/rand.h" #include "crypto/cryptlib.h" diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index 74b31bedcb02213e8ea29a226d57aac9664eb0d7..4a2e8826b8300eb3d409ae65fe9c951c34bedaca 100644 --- a/crypto/rand/rand_lib.c +++ b/crypto/rand/rand_lib.c @@ -14,7 +14,7 @@ #include "crypto/rand.h" #include #include "internal/thread_once.h" -#include "rand_lcl.h" +#include "rand_local.h" #include "e_os.h" #ifndef OPENSSL_NO_ENGINE diff --git a/crypto/rand/rand_lcl.h b/crypto/rand/rand_local.h similarity index 100% rename from crypto/rand/rand_lcl.h rename to crypto/rand/rand_local.h diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index 1da09107c64b1bfd10505287af8120d638381632..2997d3ee62da46daf9750042acbc0a9bf5e728fc 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -15,7 +15,7 @@ #include "internal/cryptlib.h" #include #include -#include "rand_lcl.h" +#include "rand_local.h" #include "crypto/rand.h" #include #include "internal/dso.h" diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c index 63ccc55d8f8c1760e3112246e2f7a9082a35e427..c0581ce6dbaa36653f8bf55b68e251d1a77d51dc 100644 --- a/crypto/rand/rand_vms.c +++ b/crypto/rand/rand_vms.c @@ -15,7 +15,7 @@ # include "internal/cryptlib.h" # include # include "crypto/rand.h" -# include "rand_lcl.h" +# include "rand_local.h" # include # include # include diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c index 5a1f8a7b2527de04ba646b382685b477686a662d..2743ee7bf86eff5e9b0117a1194bd9470a6dfb91 100644 --- a/crypto/rand/rand_win.c +++ b/crypto/rand/rand_win.c @@ -9,7 +9,7 @@ #include "internal/cryptlib.h" #include -#include "rand_lcl.h" +#include "rand_local.h" #include "crypto/rand.h" #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) diff --git a/crypto/rc2/rc2_cbc.c b/crypto/rc2/rc2_cbc.c index 2b59353b11541da8b266156f66772671ce2ed302..17e86f690e01cc7872130d141968556ef64c779a 100644 --- a/crypto/rc2/rc2_cbc.c +++ b/crypto/rc2/rc2_cbc.c @@ -8,7 +8,7 @@ */ #include -#include "rc2_locl.h" +#include "rc2_local.h" void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, RC2_KEY *ks, unsigned char *iv, int encrypt) diff --git a/crypto/rc2/rc2_ecb.c b/crypto/rc2/rc2_ecb.c index fb2f78273d8ee63b946eaf2da0ee3151293b2cac..8d9927cd5858903eb7f16b8beea9d4d764c3d704 100644 --- a/crypto/rc2/rc2_ecb.c +++ b/crypto/rc2/rc2_ecb.c @@ -8,7 +8,7 @@ */ #include -#include "rc2_locl.h" +#include "rc2_local.h" #include /*- diff --git a/crypto/rc2/rc2_locl.h b/crypto/rc2/rc2_local.h similarity index 100% rename from crypto/rc2/rc2_locl.h rename to crypto/rc2/rc2_local.h diff --git a/crypto/rc2/rc2_skey.c b/crypto/rc2/rc2_skey.c index 55d8ba37155c15fb36af6ef10432943b5994e969..60ebd42f263601c8c94bc70a6618ea0988981043 100644 --- a/crypto/rc2/rc2_skey.c +++ b/crypto/rc2/rc2_skey.c @@ -8,7 +8,7 @@ */ #include -#include "rc2_locl.h" +#include "rc2_local.h" static const unsigned char key_table[256] = { 0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79, diff --git a/crypto/rc2/rc2cfb64.c b/crypto/rc2/rc2cfb64.c index e11093db9e21a965d0e819ad81d57f196b78d34d..8d1c3a4d8f66fa99ad492072e970bdc9dfb1844c 100644 --- a/crypto/rc2/rc2cfb64.c +++ b/crypto/rc2/rc2cfb64.c @@ -8,7 +8,7 @@ */ #include -#include "rc2_locl.h" +#include "rc2_local.h" /* * The input and output encrypted as though 64bit cfb mode is being used. diff --git a/crypto/rc2/rc2ofb64.c b/crypto/rc2/rc2ofb64.c index d610278a9bdcb309dc0508c8f8ef15e63fdd79e9..61b2c56434bfe749393435ecb31b54f8a66a9d93 100644 --- a/crypto/rc2/rc2ofb64.c +++ b/crypto/rc2/rc2ofb64.c @@ -8,7 +8,7 @@ */ #include -#include "rc2_locl.h" +#include "rc2_local.h" /* * The input and output encrypted as though 64bit ofb mode is being used. diff --git a/crypto/rc4/rc4_enc.c b/crypto/rc4/rc4_enc.c index 638a75bb06a939f6dbea0d2cf818d99a922e428a..09ef6a896f072fd7293482cf8b89e0f7fd8735f6 100644 --- a/crypto/rc4/rc4_enc.c +++ b/crypto/rc4/rc4_enc.c @@ -8,7 +8,7 @@ */ #include -#include "rc4_locl.h" +#include "rc4_local.h" /*- * RC4 as implemented from a posting from diff --git a/crypto/rc4/rc4_locl.h b/crypto/rc4/rc4_local.h similarity index 100% rename from crypto/rc4/rc4_locl.h rename to crypto/rc4/rc4_local.h diff --git a/crypto/rc4/rc4_skey.c b/crypto/rc4/rc4_skey.c index e9007331eb33e47e55ce019848d47aef52dc3010..100eb79c2ada75ae4b3edec83ae5ed3da7df954a 100644 --- a/crypto/rc4/rc4_skey.c +++ b/crypto/rc4/rc4_skey.c @@ -8,7 +8,7 @@ */ #include -#include "rc4_locl.h" +#include "rc4_local.h" #include const char *RC4_options(void) diff --git a/crypto/rc5/rc5_ecb.c b/crypto/rc5/rc5_ecb.c index c32f38e473e8928e8e05d6fe6614a4f088bafc64..94ec646390dd4143a55394f5c2eb3f603e73340a 100644 --- a/crypto/rc5/rc5_ecb.c +++ b/crypto/rc5/rc5_ecb.c @@ -8,7 +8,7 @@ */ #include -#include "rc5_locl.h" +#include "rc5_local.h" #include void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out, diff --git a/crypto/rc5/rc5_enc.c b/crypto/rc5/rc5_enc.c index 58631dee20d2598e6f2f47e166f8d36401d68046..75ddeb2eaf2b9101d4e52e7d8fe83cd9c53e5e89 100644 --- a/crypto/rc5/rc5_enc.c +++ b/crypto/rc5/rc5_enc.c @@ -9,7 +9,7 @@ #include #include -#include "rc5_locl.h" +#include "rc5_local.h" void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, RC5_32_KEY *ks, unsigned char *iv, diff --git a/crypto/rc5/rc5_locl.h b/crypto/rc5/rc5_local.h similarity index 100% rename from crypto/rc5/rc5_locl.h rename to crypto/rc5/rc5_local.h diff --git a/crypto/rc5/rc5_skey.c b/crypto/rc5/rc5_skey.c index 943a7849bb8958ffc6e3abe220396ed377f02060..b2e6bbb1af244c663c0ef1e02d486f74b51b1536 100644 --- a/crypto/rc5/rc5_skey.c +++ b/crypto/rc5/rc5_skey.c @@ -8,7 +8,7 @@ */ #include -#include "rc5_locl.h" +#include "rc5_local.h" void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data, int rounds) diff --git a/crypto/rc5/rc5cfb64.c b/crypto/rc5/rc5cfb64.c index 9a8aa6b244c9cb31bff9ef342ad73830b3cdab59..cfce7ec1e84c980ff6256ec942b3bbad5810c1ec 100644 --- a/crypto/rc5/rc5cfb64.c +++ b/crypto/rc5/rc5cfb64.c @@ -8,7 +8,7 @@ */ #include -#include "rc5_locl.h" +#include "rc5_local.h" /* * The input and output encrypted as though 64bit cfb mode is being used. diff --git a/crypto/rc5/rc5ofb64.c b/crypto/rc5/rc5ofb64.c index 3a41d773cb6ecd95380c400f09b5d8d212790e1a..224eb968579c88d3ed7c568b4dc1341a2b177aa0 100644 --- a/crypto/rc5/rc5ofb64.c +++ b/crypto/rc5/rc5ofb64.c @@ -8,7 +8,7 @@ */ #include -#include "rc5_locl.h" +#include "rc5_local.h" /* * The input and output encrypted as though 64bit ofb mode is being used. diff --git a/crypto/ripemd/rmd_dgst.c b/crypto/ripemd/rmd_dgst.c index a1670c7fbd8336834db916a13327dfb5f423e24a..e9e440f18c1069e665bcf21973490da29beab68d 100644 --- a/crypto/ripemd/rmd_dgst.c +++ b/crypto/ripemd/rmd_dgst.c @@ -8,7 +8,7 @@ */ #include -#include "rmd_locl.h" +#include "rmd_local.h" #include #ifdef RMD160_ASM @@ -39,7 +39,7 @@ void ripemd160_block_data_order(RIPEMD160_CTX *ctx, const void *p, size_t num) register unsigned MD32_REG_T A, B, C, D, E; unsigned MD32_REG_T a, b, c, d, e, l; # ifndef MD32_XARRAY - /* See comment in crypto/sha/sha_locl.h for details. */ + /* See comment in crypto/sha/sha_local.h for details. */ unsigned MD32_REG_T XX0, XX1, XX2, XX3, XX4, XX5, XX6, XX7, XX8, XX9, XX10, XX11, XX12, XX13, XX14, XX15; # define X(i) XX##i diff --git a/crypto/ripemd/rmd_locl.h b/crypto/ripemd/rmd_local.h similarity index 97% rename from crypto/ripemd/rmd_locl.h rename to crypto/ripemd/rmd_local.h index a4fb54d89aae61d1c699d8c483e385a4a96f265a..f3604e349006b3c9f573f74659b2c4b744a3427b 100644 --- a/crypto/ripemd/rmd_locl.h +++ b/crypto/ripemd/rmd_local.h @@ -13,7 +13,7 @@ #include /* - * DO EXAMINE COMMENTS IN crypto/md5/md5_locl.h & crypto/md5/md5_dgst.c + * DO EXAMINE COMMENTS IN crypto/md5/md5_local.h & crypto/md5/md5_dgst.c * FOR EXPLANATIONS ON FOLLOWING "CODE." */ #ifdef RMD160_ASM diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c index fe49a61ab638501c1210c827301a5af7b32c7fde..6692a51ed8fe470d64f8b9e0b04be7cf195b10e2 100644 --- a/crypto/rsa/rsa_ameth.c +++ b/crypto/rsa/rsa_ameth.c @@ -15,7 +15,7 @@ #include #include "crypto/asn1.h" #include "crypto/evp.h" -#include "rsa_locl.h" +#include "rsa_local.h" #ifndef OPENSSL_NO_CMS static int rsa_cms_sign(CMS_SignerInfo *si); diff --git a/crypto/rsa/rsa_asn1.c b/crypto/rsa/rsa_asn1.c index 9fe62c82eb2fe42d1b2ff80b8e3c2f6f371117a2..e8df8d762e16fc7b6f7e3d8f9c8c4f46b2199246 100644 --- a/crypto/rsa/rsa_asn1.c +++ b/crypto/rsa/rsa_asn1.c @@ -12,7 +12,7 @@ #include #include #include -#include "rsa_locl.h" +#include "rsa_local.h" /* * Override the default free and new methods, diff --git a/crypto/rsa/rsa_chk.c b/crypto/rsa/rsa_chk.c index 1b69be30ca41dbacca78ec4a84ed762dc0830d4d..b4ba7fce3ffbecffba6844ab27854b0620a1a8f5 100644 --- a/crypto/rsa/rsa_chk.c +++ b/crypto/rsa/rsa_chk.c @@ -9,7 +9,7 @@ #include #include -#include "rsa_locl.h" +#include "rsa_local.h" int RSA_check_key(const RSA *key) { diff --git a/crypto/rsa/rsa_crpt.c b/crypto/rsa/rsa_crpt.c index 52abfaed71b90d53a0a72f5a719a7d6de1d0290c..f1131ce9e0ad53786be13969015d7badde23976b 100644 --- a/crypto/rsa/rsa_crpt.c +++ b/crypto/rsa/rsa_crpt.c @@ -12,7 +12,7 @@ #include "internal/cryptlib.h" #include "crypto/bn.h" #include -#include "rsa_locl.h" +#include "rsa_local.h" int RSA_bits(const RSA *r) { diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c index 2b818088606cdd9a7823ff46f7d6e21ee1c92668..29056a62a1ae0145df81ae225c5e191eeaf862c2 100644 --- a/crypto/rsa/rsa_gen.c +++ b/crypto/rsa/rsa_gen.c @@ -17,7 +17,7 @@ #include #include "internal/cryptlib.h" #include -#include "rsa_locl.h" +#include "rsa_local.h" static int rsa_builtin_keygen(RSA *rsa, int bits, int primes, BIGNUM *e_value, BN_GENCB *cb); diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index 709a3856d452de526a26a2075fde8b3679c67dde..cfee919352a79756ce6a5fde446d36dd64ba1471 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -15,7 +15,7 @@ #include #include #include "crypto/evp.h" -#include "rsa_locl.h" +#include "rsa_local.h" RSA *RSA_new(void) { diff --git a/crypto/rsa/rsa_locl.h b/crypto/rsa/rsa_local.h similarity index 100% rename from crypto/rsa/rsa_locl.h rename to crypto/rsa/rsa_local.h diff --git a/crypto/rsa/rsa_meth.c b/crypto/rsa/rsa_meth.c index def19f375f920b1df2179da5713b50947cbc8de5..2845b79db8ef7b4bdedb4b85bf8aabea2ff7aea9 100644 --- a/crypto/rsa/rsa_meth.c +++ b/crypto/rsa/rsa_meth.c @@ -8,7 +8,7 @@ */ #include -#include "rsa_locl.h" +#include "rsa_local.h" #include RSA_METHOD *RSA_meth_new(const char *name, int flags) diff --git a/crypto/rsa/rsa_mp.c b/crypto/rsa/rsa_mp.c index e7e810823b2778edd8e6104e055b9cffaad22b2f..44dda8f800bcb9d653f70e232e41c856b19cd195 100644 --- a/crypto/rsa/rsa_mp.c +++ b/crypto/rsa/rsa_mp.c @@ -10,7 +10,7 @@ #include #include -#include "rsa_locl.h" +#include "rsa_local.h" void rsa_multip_info_free_ex(RSA_PRIME_INFO *pinfo) { diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c index 48b888bf27adb48f95d2cd061fc1fb636f9b5ad6..302360a96415c46e05048e60c5024698671ab3aa 100644 --- a/crypto/rsa/rsa_oaep.c +++ b/crypto/rsa/rsa_oaep.c @@ -20,7 +20,7 @@ * one-wayness. For the RSA function, this is an equivalent notion. */ -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" #include #include "internal/cryptlib.h" @@ -28,7 +28,7 @@ #include #include #include -#include "rsa_locl.h" +#include "rsa_local.h" int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen, const unsigned char *from, int flen, diff --git a/crypto/rsa/rsa_ossl.c b/crypto/rsa/rsa_ossl.c index 01c712bab71a051ae8210b45242f7849058da9df..b52a66f6a6280321a28fd2cc8ca18a195910611c 100644 --- a/crypto/rsa/rsa_ossl.c +++ b/crypto/rsa/rsa_ossl.c @@ -9,8 +9,8 @@ #include "internal/cryptlib.h" #include "crypto/bn.h" -#include "rsa_locl.h" -#include "internal/constant_time_locl.h" +#include "rsa_local.h" +#include "internal/constant_time.h" static int rsa_ossl_public_encrypt(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding); diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c index 5260d12f4c91389f2338a7ddbf5248c480aeb23d..5deab151731b549fd040fdf2457abb7bffeb993a 100644 --- a/crypto/rsa/rsa_pk1.c +++ b/crypto/rsa/rsa_pk1.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" #include #include "internal/cryptlib.h" diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c index aabd245f11f1ce346363c576b3b5e7a65189f831..0eb21c8af9756d568e74da98b54f06ada617faa3 100644 --- a/crypto/rsa/rsa_pmeth.c +++ b/crypto/rsa/rsa_pmeth.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" #include #include "internal/cryptlib.h" @@ -19,7 +19,7 @@ #include #include #include "crypto/evp.h" -#include "rsa_locl.h" +#include "rsa_local.h" /* RSA pkey context structure */ diff --git a/crypto/rsa/rsa_pss.c b/crypto/rsa/rsa_pss.c index f7c575d00ab1232cefac095b449ccc12cf2595b4..40ce1c4d378a65935a27544ca14c6f9d2c1b8464 100644 --- a/crypto/rsa/rsa_pss.c +++ b/crypto/rsa/rsa_pss.c @@ -14,7 +14,7 @@ #include #include #include -#include "rsa_locl.h" +#include "rsa_local.h" static const unsigned char zeroes[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; diff --git a/crypto/rsa/rsa_sign.c b/crypto/rsa/rsa_sign.c index e3cc2d4829272996f76ef8d00980d1ebd196cb48..7fc69361bf0a3848e34b7fdf12952223ea32abbf 100644 --- a/crypto/rsa/rsa_sign.c +++ b/crypto/rsa/rsa_sign.c @@ -14,7 +14,7 @@ #include #include #include "crypto/x509.h" -#include "rsa_locl.h" +#include "rsa_local.h" /* Size of an SSL signature: MD5+SHA1 */ #define SSL_SIG_LENGTH 36 diff --git a/crypto/rsa/rsa_ssl.c b/crypto/rsa/rsa_ssl.c index 3859128a6d808eeae66ece2ae09615d24816c0a8..0a659bc49c692f83770fd5adfa55b58d50d54aea 100644 --- a/crypto/rsa/rsa_ssl.c +++ b/crypto/rsa/rsa_ssl.c @@ -12,7 +12,7 @@ #include #include #include -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" int RSA_padding_add_SSLv23(unsigned char *to, int tlen, const unsigned char *from, int flen) diff --git a/crypto/rsa/rsa_x931g.c b/crypto/rsa/rsa_x931g.c index e7ac476bb4a4ffd475c2260d17713f7bfb345d06..322cd14a840d695e95e90c046888ef75d1ce8828 100644 --- a/crypto/rsa/rsa_x931g.c +++ b/crypto/rsa/rsa_x931g.c @@ -12,7 +12,7 @@ #include #include #include -#include "rsa_locl.h" +#include "rsa_local.h" /* X9.31 RSA key derivation and generation */ diff --git a/crypto/seed/seed.c b/crypto/seed/seed.c index d62da91edea6891f04ec14b58351b249029ea2e3..c3a1f183a5cc3dc148de229f177a7648e0b92638 100644 --- a/crypto/seed/seed.c +++ b/crypto/seed/seed.c @@ -42,7 +42,7 @@ # endif # include -# include "seed_locl.h" +# include "seed_local.h" # ifdef SS /* can get defined on Solaris by inclusion of * */ diff --git a/crypto/seed/seed_locl.h b/crypto/seed/seed_local.h similarity index 100% rename from crypto/seed/seed_locl.h rename to crypto/seed/seed_local.h diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c index 819370e61540f5371bc0743d74dd0cc2841b6040..7965829e64b0bf06987bcaae3d99baefde919e29 100644 --- a/crypto/sha/sha1dgst.c +++ b/crypto/sha/sha1dgst.c @@ -14,4 +14,4 @@ /* The implementation is in ../md32_common.h */ -# include "sha_locl.h" +# include "sha_local.h" diff --git a/crypto/sha/sha_locl.h b/crypto/sha/sha_local.h similarity index 100% rename from crypto/sha/sha_locl.h rename to crypto/sha/sha_local.h diff --git a/crypto/sm3/sm3.c b/crypto/sm3/sm3.c index 1588dd115aa286aabc488d6d54bd3dd6a98cae87..d78292b4c5b7e7fe6968bcf2525e67b16a21a3fa 100644 --- a/crypto/sm3/sm3.c +++ b/crypto/sm3/sm3.c @@ -10,7 +10,7 @@ */ #include -#include "sm3_locl.h" +#include "sm3_local.h" int sm3_init(SM3_CTX *c) { diff --git a/crypto/sm3/sm3_locl.h b/crypto/sm3/sm3_local.h similarity index 100% rename from crypto/sm3/sm3_locl.h rename to crypto/sm3/sm3_local.h diff --git a/crypto/store/loader_file.c b/crypto/store/loader_file.c index bb3410dfd45dd52f8b27f3562bab029bf4e2a77e..8f1d20e74aa4f429b73aa5fc3d70ca7981ebea49 100644 --- a/crypto/store/loader_file.c +++ b/crypto/store/loader_file.c @@ -29,7 +29,7 @@ #include "internal/o_dir.h" #include "internal/cryptlib.h" #include "crypto/store.h" -#include "store_locl.h" +#include "store_local.h" #ifdef _WIN32 # define stat _stat diff --git a/crypto/store/store_init.c b/crypto/store/store_init.c index 5f81ef19b1e98b2466cc70e22b543e2914a8532d..0103c8db8aaf5bb22976a4c27530663c3186ab90 100644 --- a/crypto/store/store_init.c +++ b/crypto/store/store_init.c @@ -9,7 +9,7 @@ #include #include "crypto/store.h" -#include "store_locl.h" +#include "store_local.h" static CRYPTO_ONCE store_init = CRYPTO_ONCE_STATIC_INIT; DEFINE_RUN_ONCE_STATIC(do_store_init) diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c index ddbc1e0091dc2ac22377b80223c45211a9a1217f..fb8184d2d9b540cf40d745c563c5636f6153a643 100644 --- a/crypto/store/store_lib.c +++ b/crypto/store/store_lib.c @@ -19,7 +19,7 @@ #include #include "internal/thread_once.h" #include "crypto/store.h" -#include "store_locl.h" +#include "store_local.h" struct ossl_store_ctx_st { const OSSL_STORE_LOADER *loader; diff --git a/crypto/store/store_locl.h b/crypto/store/store_local.h similarity index 100% rename from crypto/store/store_locl.h rename to crypto/store/store_local.h diff --git a/crypto/store/store_register.c b/crypto/store/store_register.c index 79c4fcce9cb97b2318647c883204eb3790b52553..3631d9b506346b2bfc2e1fe48b11cc59e5d626f5 100644 --- a/crypto/store/store_register.c +++ b/crypto/store/store_register.c @@ -13,7 +13,7 @@ #include #include -#include "store_locl.h" +#include "store_local.h" static CRYPTO_RWLOCK *registry_lock; static CRYPTO_ONCE registry_init = CRYPTO_ONCE_STATIC_INIT; diff --git a/crypto/ts/ts_asn1.c b/crypto/ts/ts_asn1.c index 8707207082c9a14477038fd9aa12f326b01a37ae..2840f5858acbff7c6b7313e2e3110d1cf7790fc1 100644 --- a/crypto/ts/ts_asn1.c +++ b/crypto/ts/ts_asn1.c @@ -10,7 +10,7 @@ #include #include #include -#include "ts_lcl.h" +#include "ts_local.h" ASN1_SEQUENCE(TS_MSG_IMPRINT) = { ASN1_SIMPLE(TS_MSG_IMPRINT, hash_algo, X509_ALGOR), diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c index ce2e12c593e068bba5339d4cf59e727cb39db317..bfe981364b03f8c5f7e95637bd70ea39ec2d4f66 100644 --- a/crypto/ts/ts_lib.c +++ b/crypto/ts/ts_lib.c @@ -14,7 +14,7 @@ #include #include #include -#include "ts_lcl.h" +#include "ts_local.h" int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num) { diff --git a/crypto/ts/ts_lcl.h b/crypto/ts/ts_local.h similarity index 100% rename from crypto/ts/ts_lcl.h rename to crypto/ts/ts_local.h diff --git a/crypto/ts/ts_req_print.c b/crypto/ts/ts_req_print.c index 0dedf47d924b1ebd41cf28c2be09b125cba9d72a..4eba5cf0181c4ecf041d5026a4d48c35adf8d06a 100644 --- a/crypto/ts/ts_req_print.c +++ b/crypto/ts/ts_req_print.c @@ -13,7 +13,7 @@ #include #include #include -#include "ts_lcl.h" +#include "ts_local.h" int TS_REQ_print_bio(BIO *bio, TS_REQ *a) { diff --git a/crypto/ts/ts_req_utils.c b/crypto/ts/ts_req_utils.c index 2073d3395d75e2a55cda9a18aee0e6a3ceded2c6..a4568e3b779d8b9599d3797acb0c24ec1ed71f44 100644 --- a/crypto/ts/ts_req_utils.c +++ b/crypto/ts/ts_req_utils.c @@ -12,7 +12,7 @@ #include #include #include -#include "ts_lcl.h" +#include "ts_local.h" int TS_REQ_set_version(TS_REQ *a, long version) { diff --git a/crypto/ts/ts_rsp_print.c b/crypto/ts/ts_rsp_print.c index 6eb0ec8d7504bf7d5e076cd1c1449f56ee605bf7..a2451aaa8d8100a85f912876e68cb26a81643056 100644 --- a/crypto/ts/ts_rsp_print.c +++ b/crypto/ts/ts_rsp_print.c @@ -13,7 +13,7 @@ #include #include #include -#include "ts_lcl.h" +#include "ts_local.h" struct status_map_st { int bit; diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c index 1b2b84ef6b67dbccf90a937d76e81dd8e9127e33..a584ae5f5edde0ba065c71fb245e26f40e8dbebf 100644 --- a/crypto/ts/ts_rsp_sign.c +++ b/crypto/ts/ts_rsp_sign.c @@ -14,7 +14,7 @@ #include #include #include -#include "ts_lcl.h" +#include "ts_local.h" static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *, void *); static int def_time_cb(struct TS_resp_ctx *, void *, long *sec, long *usec); diff --git a/crypto/ts/ts_rsp_utils.c b/crypto/ts/ts_rsp_utils.c index 3ecee39a22c21e611c8bbfc672d1f4596b545271..3fa0dbd0f09eec3689c87891716ba2841620e226 100644 --- a/crypto/ts/ts_rsp_utils.c +++ b/crypto/ts/ts_rsp_utils.c @@ -12,7 +12,7 @@ #include #include #include -#include "ts_lcl.h" +#include "ts_local.h" int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *status_info) { diff --git a/crypto/ts/ts_rsp_verify.c b/crypto/ts/ts_rsp_verify.c index 9deda81b07fb8267ffe26b445e25b500e0455b74..086021247c01ca23c3fe3fbba8b72a7a98436bdc 100644 --- a/crypto/ts/ts_rsp_verify.c +++ b/crypto/ts/ts_rsp_verify.c @@ -12,7 +12,7 @@ #include #include #include -#include "ts_lcl.h" +#include "ts_local.h" static int ts_verify_cert(X509_STORE *store, STACK_OF(X509) *untrusted, X509 *signer, STACK_OF(X509) **chain); diff --git a/crypto/ts/ts_verify_ctx.c b/crypto/ts/ts_verify_ctx.c index d4792ee04f597d00dcf8c07b58585c6f0c52aa9d..1e80e0d3702966a275578f3a00f2a786b98895f6 100644 --- a/crypto/ts/ts_verify_ctx.c +++ b/crypto/ts/ts_verify_ctx.c @@ -10,7 +10,7 @@ #include "internal/cryptlib.h" #include #include -#include "ts_lcl.h" +#include "ts_local.h" TS_VERIFY_CTX *TS_VERIFY_CTX_new(void) { diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c index f550972d3eec587462630191af710389a9de699b..49cc45057c4cfc25ec0a9c600f461172ec8e6eb5 100644 --- a/crypto/ui/ui_lib.c +++ b/crypto/ui/ui_lib.c @@ -13,7 +13,7 @@ #include #include #include -#include "ui_locl.h" +#include "ui_local.h" UI *UI_new(void) { diff --git a/crypto/ui/ui_locl.h b/crypto/ui/ui_local.h similarity index 100% rename from crypto/ui/ui_locl.h rename to crypto/ui/ui_local.h diff --git a/crypto/ui/ui_null.c b/crypto/ui/ui_null.c index 9e5f6fca59e58c2575ae8400eda4aa4767bc9237..9ab00e0a7cb8b66ac592950c6e85489d1874395d 100644 --- a/crypto/ui/ui_null.c +++ b/crypto/ui/ui_null.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "ui_locl.h" +#include "ui_local.h" static const UI_METHOD ui_null = { "OpenSSL NULL UI", diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 0ec9f0daf333ee758ba293af98dda49a6c36e2a7..168de4630dcc01388451cba22f27adbeb2ce5fed 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -53,7 +53,7 @@ # endif # endif -# include "ui_locl.h" +# include "ui_local.h" # include "internal/cryptlib.h" # ifdef OPENSSL_SYS_VMS /* prototypes for sys$whatever */ diff --git a/crypto/ui/ui_util.c b/crypto/ui/ui_util.c index b379324f9bab3c6778a243c294946cc19fd1a3ba..6a37b6d287f60f52252d550d75a6042d8ccc1c7e 100644 --- a/crypto/ui/ui_util.c +++ b/crypto/ui/ui_util.c @@ -9,7 +9,7 @@ #include #include "internal/thread_once.h" -#include "ui_locl.h" +#include "ui_local.h" #ifndef BUFSIZ #define BUFSIZ 256 diff --git a/crypto/whrlpool/wp_block.c b/crypto/whrlpool/wp_block.c index 2ae5c38aba63e76a058d7fbf688d4563ffba9d35..c21c04dbc1bbfb124dd83edfa60010d5083bed4f 100644 --- a/crypto/whrlpool/wp_block.c +++ b/crypto/whrlpool/wp_block.c @@ -36,7 +36,7 @@ * */ -#include "wp_locl.h" +#include "wp_local.h" #include typedef unsigned char u8; diff --git a/crypto/whrlpool/wp_dgst.c b/crypto/whrlpool/wp_dgst.c index 1ac29803a4d6aaa600fbe6fe7f20b1586203c64d..e8a3392268aa3c2333a57c536f2cef2220b7712b 100644 --- a/crypto/whrlpool/wp_dgst.c +++ b/crypto/whrlpool/wp_dgst.c @@ -53,7 +53,7 @@ */ #include -#include "wp_locl.h" +#include "wp_local.h" #include int WHIRLPOOL_Init(WHIRLPOOL_CTX *c) diff --git a/crypto/whrlpool/wp_locl.h b/crypto/whrlpool/wp_local.h similarity index 100% rename from crypto/whrlpool/wp_locl.h rename to crypto/whrlpool/wp_local.h diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index aaaecdfcd41f473b754651196ae8b2a30613e3f9..238c2519a6e2d2a4fd797d1d6099d0c2b49daabf 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -20,7 +20,7 @@ #include #include "crypto/x509.h" -#include "x509_lcl.h" +#include "x509_local.h" struct lookup_dir_hashes_st { unsigned long hash; diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c index 244512c9352b3a1543f8ea3acddf269ee2462b81..237b362e27462788a6ceaaf147a9e01af7c8c321 100644 --- a/crypto/x509/by_file.c +++ b/crypto/x509/by_file.c @@ -15,7 +15,7 @@ #include #include #include -#include "x509_lcl.h" +#include "x509_local.h" static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl, char **ret); diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c index 3c4566d2e708eb1436ce0008d1e8dcf31b19e013..651aa78083093e4817ee29f028c548f7db751f71 100644 --- a/crypto/x509/x509_att.c +++ b/crypto/x509/x509_att.c @@ -15,7 +15,7 @@ #include #include #include -#include "x509_lcl.h" +#include "x509_local.h" int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x) { diff --git a/crypto/x509/x509_lcl.h b/crypto/x509/x509_local.h similarity index 100% rename from crypto/x509/x509_lcl.h rename to crypto/x509/x509_local.h diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c index 658fad34dfa2cdb4f4cd521a29e7fac1fd74a3ac..641a41c35c784d9632718e832df9ea839173a453 100644 --- a/crypto/x509/x509_lu.c +++ b/crypto/x509/x509_lu.c @@ -13,7 +13,7 @@ #include #include "crypto/x509.h" #include -#include "x509_lcl.h" +#include "x509_local.h" X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method) { diff --git a/crypto/x509/x509_meth.c b/crypto/x509/x509_meth.c index 9dc587a0921243e223d39ea3e31cf77df14ae704..9348cc8eb788a3fe6fc893a220b48cc751fb9efd 100644 --- a/crypto/x509/x509_meth.c +++ b/crypto/x509/x509_meth.c @@ -15,7 +15,7 @@ #include #include #include -#include "x509_lcl.h" +#include "x509_local.h" X509_LOOKUP_METHOD *X509_LOOKUP_meth_new(const char *name) { diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c index 01ebec9721998e499fff6b2f7612b76da5d0a854..164b4e2be136a97c8fe8e25b198a92b8b910b76b 100644 --- a/crypto/x509/x509_set.c +++ b/crypto/x509/x509_set.c @@ -17,7 +17,7 @@ #include #include "crypto/asn1.h" #include "crypto/x509.h" -#include "x509_lcl.h" +#include "x509_local.h" int X509_set_version(X509 *x, long version) { diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c index 75ae767d608c94ef62c584f84ca5ac0792343d57..c7876023304ca4658452959e1421b62ec0e38c59 100644 --- a/crypto/x509/x509_v3.c +++ b/crypto/x509/x509_v3.c @@ -15,7 +15,7 @@ #include #include #include -#include "x509_lcl.h" +#include "x509_local.h" int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x) { diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c index db0d9ae2d45a99c7c5c257e4351183a9e82ce6e7..361954c62ee785bc45f1604d1f289260ac57074c 100644 --- a/crypto/x509/x509_vfy.c +++ b/crypto/x509/x509_vfy.c @@ -23,7 +23,7 @@ #include #include "internal/dane.h" #include "crypto/x509.h" -#include "x509_lcl.h" +#include "x509_local.h" /* CRL score values */ diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c index 12a78e784c5089de61b3fc1793ff73fae438e037..68b681d5ee854a2dfe7a1475060ad092c6a83822 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -16,7 +16,7 @@ #include #include "crypto/x509.h" -#include "x509_lcl.h" +#include "x509_local.h" /* X509_VERIFY_PARAM functions */ diff --git a/crypto/x509/x_attrib.c b/crypto/x509/x_attrib.c index 9a41e547cb2eead73892a535aa570bfca3dd150b..813c5b01c3aeb6d270444d92a1c337aca09bc513 100644 --- a/crypto/x509/x_attrib.c +++ b/crypto/x509/x_attrib.c @@ -12,7 +12,7 @@ #include #include #include -#include "x509_lcl.h" +#include "x509_local.h" /*- * X509_ATTRIBUTE: this has the following form: diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c index ad41d140998f534eb39c65299776d8779053c536..e864126fef372609ccd1b59d6fcbf4aa87177c9d 100644 --- a/crypto/x509/x_crl.c +++ b/crypto/x509/x_crl.c @@ -13,7 +13,7 @@ #include #include "crypto/x509.h" #include -#include "x509_lcl.h" +#include "x509_local.h" static int X509_REVOKED_cmp(const X509_REVOKED *const *a, const X509_REVOKED *const *b); diff --git a/crypto/x509/x_exten.c b/crypto/x509/x_exten.c index f10f4a4d87698c144dd520a7964e6ba3c4c1e3b9..bd7518ef12bfca0601d423b0e81d7a46bc9afb71 100644 --- a/crypto/x509/x_exten.c +++ b/crypto/x509/x_exten.c @@ -11,7 +11,7 @@ #include #include #include -#include "x509_lcl.h" +#include "x509_local.h" ASN1_SEQUENCE(X509_EXTENSION) = { ASN1_SIMPLE(X509_EXTENSION, object, ASN1_OBJECT), diff --git a/crypto/x509/x_name.c b/crypto/x509/x_name.c index ef2a275876f60dfae1582b5be701c6419a0bb4aa..aa7f4722b6b9ee8187fc628c354214450772c4a0 100644 --- a/crypto/x509/x_name.c +++ b/crypto/x509/x_name.c @@ -14,7 +14,7 @@ #include #include "crypto/x509.h" #include "crypto/asn1.h" -#include "x509_lcl.h" +#include "x509_local.h" /* * Maximum length of X509_NAME: much larger than anything we should diff --git a/crypto/x509v3/pcy_cache.c b/crypto/x509v3/pcy_cache.c index 6a4db420511aee458016cfa9dfb13dee3806efb4..04401bace8c5881400fd0ffaa61600d4960f1060 100644 --- a/crypto/x509v3/pcy_cache.c +++ b/crypto/x509v3/pcy_cache.c @@ -12,7 +12,7 @@ #include #include "crypto/x509.h" -#include "pcy_int.h" +#include "pcy_local.h" static int policy_data_cmp(const X509_POLICY_DATA *const *a, const X509_POLICY_DATA *const *b); diff --git a/crypto/x509v3/pcy_data.c b/crypto/x509v3/pcy_data.c index bd3bb0e40dfe6ba5401d85e3a073eb85cfc8739c..073505951322018e3fb629d083e65bc39194a45c 100644 --- a/crypto/x509v3/pcy_data.c +++ b/crypto/x509v3/pcy_data.c @@ -11,7 +11,7 @@ #include #include -#include "pcy_int.h" +#include "pcy_local.h" /* Policy Node routines */ diff --git a/crypto/x509v3/pcy_lib.c b/crypto/x509v3/pcy_lib.c index 67f7eafc6e8d2ee52f16662ddf3a02ed91a5eb8e..2e196b838ca264d92f4aae1d0865afba130af45e 100644 --- a/crypto/x509v3/pcy_lib.c +++ b/crypto/x509v3/pcy_lib.c @@ -11,7 +11,7 @@ #include #include -#include "pcy_int.h" +#include "pcy_local.h" /* accessor functions */ diff --git a/crypto/x509v3/pcy_int.h b/crypto/x509v3/pcy_local.h similarity index 100% rename from crypto/x509v3/pcy_int.h rename to crypto/x509v3/pcy_local.h diff --git a/crypto/x509v3/pcy_map.c b/crypto/x509v3/pcy_map.c index 4fc3eb6d42665947d097c46f9dfa8b211b9db3d9..ae2a62c97787006dac46cfe47275a73630cf6505 100644 --- a/crypto/x509v3/pcy_map.c +++ b/crypto/x509v3/pcy_map.c @@ -12,7 +12,7 @@ #include #include "crypto/x509.h" -#include "pcy_int.h" +#include "pcy_local.h" /* * Set policy mapping entries in cache. Note: this modifies the passed diff --git a/crypto/x509v3/pcy_node.c b/crypto/x509v3/pcy_node.c index 1ffe98498bdb4ad84a68452dcd37e6ab4ab28571..e2d7b153223636a56efcf0cbd568892e38ad0a7a 100644 --- a/crypto/x509v3/pcy_node.c +++ b/crypto/x509v3/pcy_node.c @@ -12,7 +12,7 @@ #include #include -#include "pcy_int.h" +#include "pcy_local.h" static int node_cmp(const X509_POLICY_NODE *const *a, const X509_POLICY_NODE *const *b) diff --git a/crypto/x509v3/pcy_tree.c b/crypto/x509v3/pcy_tree.c index 87f51d001bbbc1d52526c4f64e300463e173a3be..6e8322cbc5e38c9711538e58cb0be2b0d235e8a6 100644 --- a/crypto/x509v3/pcy_tree.c +++ b/crypto/x509v3/pcy_tree.c @@ -11,7 +11,7 @@ #include #include -#include "pcy_int.h" +#include "pcy_local.h" /* * Enable this to print out the complete policy tree at various point during diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509v3/v3_cpols.c index 7a47fd38b379011dde28008a426bcc74226891c0..1d12c899125c852eaef6000d4a921162cf3b2917 100644 --- a/crypto/x509v3/v3_cpols.c +++ b/crypto/x509v3/v3_cpols.c @@ -14,7 +14,7 @@ #include #include -#include "pcy_int.h" +#include "pcy_local.h" #include "ext_dat.h" /* Certificate policies extension support: this one is a bit complex... */ diff --git a/include/internal/constant_time_locl.h b/include/internal/constant_time.h similarity index 100% rename from include/internal/constant_time_locl.h rename to include/internal/constant_time.h diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c index d1876d8b8c1f4a37586641625e99b791adedd17a..ab9e6668cd57f993182bd54872b47b608cfbdf63 100644 --- a/ssl/bio_ssl.c +++ b/ssl/bio_ssl.c @@ -14,7 +14,7 @@ #include #include "internal/bio.h" #include -#include "ssl_locl.h" +#include "ssl_local.h" static int ssl_write(BIO *h, const char *buf, size_t size, size_t *written); static int ssl_read(BIO *b, char *buf, size_t size, size_t *readbytes); diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index fcda32754735ca8999b5a258a91d77287b80d7ae..2a15ee8ad9654fa041e659ddd31fbf383db25933 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -11,7 +11,7 @@ #include #include #include -#include "ssl_locl.h" +#include "ssl_local.h" static void get_current_time(struct timeval *t); static int dtls1_handshake_write(SSL *s); diff --git a/ssl/d1_msg.c b/ssl/d1_msg.c index 6365b365e7f621f1aa0988e9eca24e62fc693de2..8a31064ae13f54fdd8e8530876a7c03a9e874ff0 100644 --- a/ssl/d1_msg.c +++ b/ssl/d1_msg.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "ssl_locl.h" +#include "ssl_local.h" int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf_, size_t len, size_t *written) diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c index ff8f0c5712df54217da26aa1fc7b5d48b1c6abbc..c05a77e34668c6aff1e5d786d548f2b5cf319b35 100644 --- a/ssl/d1_srtp.c +++ b/ssl/d1_srtp.c @@ -15,7 +15,7 @@ #include #include -#include "ssl_locl.h" +#include "ssl_local.h" #ifndef OPENSSL_NO_SRTP diff --git a/ssl/methods.c b/ssl/methods.c index 348efe467dbbcbef2355fe75b20ea52b46e2ab5d..c5e8898364cd7df86d64791df423ad81a9f18502 100644 --- a/ssl/methods.c +++ b/ssl/methods.c @@ -9,7 +9,7 @@ #include #include -#include "ssl_locl.h" +#include "ssl_local.h" /*- * TLS/SSLv3 methods diff --git a/ssl/packet.c b/ssl/packet.c index 95031430ed6687637257f74f365f351b48520c30..1ddde969f3b232eadb2d349c0a6c0d93ee91a2eb 100644 --- a/ssl/packet.c +++ b/ssl/packet.c @@ -8,7 +8,7 @@ */ #include "internal/cryptlib.h" -#include "packet_locl.h" +#include "packet_local.h" #include #define DEFAULT_BUF_SIZE 256 diff --git a/ssl/packet_locl.h b/ssl/packet_local.h similarity index 100% rename from ssl/packet_locl.h rename to ssl/packet_local.h diff --git a/ssl/pqueue.c b/ssl/pqueue.c index 548a7a443d914545cfaba504a7583f388d8df2f8..758440217d4516391bc731af394caf7091d5b33d 100644 --- a/ssl/pqueue.c +++ b/ssl/pqueue.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "ssl_locl.h" +#include "ssl_local.h" #include struct pqueue_st { diff --git a/ssl/record/README b/ssl/record/README index 987e9fd305d945d84d551a7eb535cd9e535dedec..630fe8027af18137c7c434b1d540740d0fce5e46 100644 --- a/ssl/record/README +++ b/ssl/record/README @@ -12,7 +12,7 @@ of these components is defined by: 3) A set of accessor macros All struct definitions are in record.h. The functions and macros are either -defined in record.h or record_locl.h dependent on whether they are intended to +defined in record.h or record_local.h dependent on whether they are intended to be private to the record layer, or whether they form part of the API to the rest of libssl. @@ -55,7 +55,7 @@ Conceptually it looks like this: || rec_layer_d1.c || ||____________________|| |______________________| - record_locl.h ^ ^ ^ + record_local.h ^ ^ ^ _________________| | |_________________ | | | _____V_________ ______V________ _______V________ diff --git a/ssl/record/dtls1_bitmap.c b/ssl/record/dtls1_bitmap.c index 5923c53717c9dfe57290302cfaa54c615991ae32..8167b41834045c411927755a539b2c52afa916f5 100644 --- a/ssl/record/dtls1_bitmap.c +++ b/ssl/record/dtls1_bitmap.c @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#include "../ssl_locl.h" -#include "record_locl.h" +#include "../ssl_local.h" +#include "record_local.h" /* mod 128 saturating subtract of two 64-bit values in big-endian order */ static int satsub64be(const unsigned char *v1, const unsigned char *v2) diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c index cb5d54ef5a8f4a4037b2eba324f69a3173aa9a0c..73ca8a6ee4b97349ebd631ce1169fda74e45783c 100644 --- a/ssl/record/rec_layer_d1.c +++ b/ssl/record/rec_layer_d1.c @@ -9,11 +9,11 @@ #include #include -#include "../ssl_locl.h" +#include "../ssl_local.h" #include #include -#include "record_locl.h" -#include "../packet_locl.h" +#include "record_local.h" +#include "../packet_local.h" #include "internal/cryptlib.h" int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl) diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index 982a06089c116b2b883f53cee6d1b24b939ea62d..76a00fc510e1ee8091ec5da597395a78791bdabc 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -10,12 +10,12 @@ #include #include #include -#include "../ssl_locl.h" +#include "../ssl_local.h" #include #include #include -#include "record_locl.h" -#include "../packet_locl.h" +#include "record_local.h" +#include "../packet_local.h" #if defined(OPENSSL_SMALL_FOOTPRINT) || \ !( defined(AES_ASM) && ( \ diff --git a/ssl/record/record_locl.h b/ssl/record/record_local.h similarity index 100% rename from ssl/record/record_locl.h rename to ssl/record/record_local.h diff --git a/ssl/record/ssl3_buffer.c b/ssl/record/ssl3_buffer.c index 53bd4cb190d0e7b0c8edc204e1ba11b1c5a3748b..605f8f9b75be8f7ea1ac298c4202e8bf590173f1 100644 --- a/ssl/record/ssl3_buffer.c +++ b/ssl/record/ssl3_buffer.c @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#include "../ssl_locl.h" -#include "record_locl.h" +#include "../ssl_local.h" +#include "record_local.h" void SSL3_BUFFER_set_data(SSL3_BUFFER *b, const unsigned char *d, size_t n) { diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c index e59ac5a676761ef0bddf39b9718ddc96599888bb..d116ff0e90854bef7450f89493d35332db0ceca4 100644 --- a/ssl/record/ssl3_record.c +++ b/ssl/record/ssl3_record.c @@ -7,10 +7,10 @@ * https://www.openssl.org/source/license.html */ -#include "../ssl_locl.h" -#include "internal/constant_time_locl.h" +#include "../ssl_local.h" +#include "internal/constant_time.h" #include -#include "record_locl.h" +#include "record_local.h" #include "internal/cryptlib.h" static const unsigned char ssl3_pad_1[48] = { diff --git a/ssl/record/ssl3_record_tls13.c b/ssl/record/ssl3_record_tls13.c index a11ed483e6682b559bdd35f429eed532f29ca9bf..89d789cb235d59ae6136ec8cb289ef29962d844e 100644 --- a/ssl/record/ssl3_record_tls13.c +++ b/ssl/record/ssl3_record_tls13.c @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#include "../ssl_locl.h" -#include "record_locl.h" +#include "../ssl_local.h" +#include "record_local.h" #include "internal/cryptlib.h" /*- diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c index 8377d7fe13dcb2dec217594e22a55306bb3f1c4d..aa7d63f84a9f3f98a82793d3fe9a4068737fea07 100644 --- a/ssl/s3_cbc.c +++ b/ssl/s3_cbc.c @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#include "internal/constant_time_locl.h" -#include "ssl_locl.h" +#include "internal/constant_time.h" +#include "ssl_local.h" #include "internal/cryptlib.h" #include diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 2e185e9fba9af71e044139b7839c4c2ee14da427..8a89f512fe608543eb487a88f23686f93f7eb9db 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -9,7 +9,7 @@ */ #include -#include "ssl_locl.h" +#include "ssl_local.h" #include #include #include "internal/cryptlib.h" diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 066bf47221e2546e5254e1d42df98d99d1b8cfd1..0cb3e8ccd3349d271aeb1d72d56809f8cc89a31f 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -12,7 +12,7 @@ #include #include #include "internal/nelem.h" -#include "ssl_locl.h" +#include "ssl_local.h" #include #include #include diff --git a/ssl/s3_msg.c b/ssl/s3_msg.c index 42382547fb2abbed9d411e08bffa2af3d5a7c13c..339fb2774a63391cd4c522cc9299b5eaaa41e4c0 100644 --- a/ssl/s3_msg.c +++ b/ssl/s3_msg.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "ssl_locl.h" +#include "ssl_local.h" int ssl3_do_change_cipher_spec(SSL *s) { diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c index b56c5e96c53019698b03d8df7f60967f2250bae0..799fee771ba517cadb0e292a078ec50b2105e6fd 100644 --- a/ssl/ssl_asn1.c +++ b/ssl/ssl_asn1.c @@ -10,7 +10,7 @@ #include #include -#include "ssl_locl.h" +#include "ssl_local.h" #include #include diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 9df9fb96778d579ee8efb8479be9961e5717e839..b56099e33ceca297da3247ba5dc235139bd8c51c 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -20,7 +20,7 @@ #include #include #include "internal/refcount.h" -#include "ssl_locl.h" +#include "ssl_local.h" #include "ssl_cert_table.h" #include "internal/thread_once.h" diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 27a1b2ec68b3d0295f963b7af1b2e11ad4b6a1b5..735a483c64486aaf3e173de3fefcef427a003ac3 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -17,7 +17,7 @@ #include #include #include "internal/nelem.h" -#include "ssl_locl.h" +#include "ssl_local.h" #include "internal/thread_once.h" #include "internal/cryptlib.h" @@ -92,7 +92,7 @@ static CRYPTO_ONCE ssl_load_builtin_comp_once = CRYPTO_ONCE_STATIC_INIT; /* * Constant SSL_MAX_DIGEST equal to size of digests array should be defined - * in the ssl_locl.h + * in the ssl_local.h */ #define SSL_MD_NUM_IDX SSL_MAX_DIGEST diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index 9c202708d7d9ddf7200af56e139c2e79c57c2b80..8ef29bb3453535e5338f305d6724d1aea09c9430 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -8,7 +8,7 @@ */ #include -#include "ssl_locl.h" +#include "ssl_local.h" #include #include #include diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index f0969fa9b1afab55a5bf61d0a74e2d2078521e23..d083d9597091ab370ecb72f2358bf8930d8d9b0d 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -12,7 +12,7 @@ #include "internal/err.h" #include #include -#include "ssl_locl.h" +#include "ssl_local.h" #include "internal/thread_once.h" static int stopped; diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index ac820cf9fe160cee77546e46720d6456bd637ead..0d0c0dbd6ad4a225ba368d5e5ab59a4b8fd16673 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -10,7 +10,7 @@ */ #include -#include "ssl_locl.h" +#include "ssl_local.h" #include #include #include diff --git a/ssl/ssl_locl.h b/ssl/ssl_local.h similarity index 99% rename from ssl/ssl_locl.h rename to ssl/ssl_local.h index 25875c9f6d464fbfda3d9aa15d930314acda0fbe..ef9e1531666d55236cac8c9f0dd4f8a636063d78 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_local.h @@ -30,7 +30,7 @@ # include # include "record/record.h" # include "statem/statem.h" -# include "packet_locl.h" +# include "packet_local.h" # include "internal/dane.h" # include "internal/refcount.h" # include "internal/tsan_assist.h" diff --git a/ssl/ssl_mcnf.c b/ssl/ssl_mcnf.c index a0e265771449174e65f0b466cd24670e3a0ab91b..583df416690863e5f2803f087943c1bc26c4c2fb 100644 --- a/ssl/ssl_mcnf.c +++ b/ssl/ssl_mcnf.c @@ -10,7 +10,7 @@ #include #include #include -#include "ssl_locl.h" +#include "ssl_local.h" #include "internal/sslconf.h" /* SSL library configuration module. */ diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c index 172e15f92087410e02692b7befd941c6a655aab3..b9693527b3d2c7d07afae132a7a1d146472b7ce7 100644 --- a/ssl/ssl_rsa.c +++ b/ssl/ssl_rsa.c @@ -8,8 +8,8 @@ */ #include -#include "ssl_locl.h" -#include "packet_locl.h" +#include "ssl_local.h" +#include "packet_local.h" #include #include #include diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 52cfa7ef6d7f0022d1a9ea14713fffd4b871d3fb..40c157bb42f8399c70bf1c44b75904fad61cde04 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -13,8 +13,8 @@ #include #include "internal/refcount.h" #include "internal/cryptlib.h" -#include "ssl_locl.h" -#include "statem/statem_locl.h" +#include "ssl_local.h" +#include "statem/statem_local.h" static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s); static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s); diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c index 179513b1a3d0cd5aa112df78d9f2bd0e6765ff5b..ca51c0331c22827e8c3ee324509fcda776b18cdc 100644 --- a/ssl/ssl_stat.c +++ b/ssl/ssl_stat.c @@ -9,7 +9,7 @@ */ #include -#include "ssl_locl.h" +#include "ssl_local.h" const char *SSL_state_string_long(const SSL *s) { diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c index cf6e4c3c05799f9199f8f6a03e4cc5ea8dc7e504..457bc8b3c20a98da481867d9123a166e92dd5d02 100644 --- a/ssl/ssl_txt.c +++ b/ssl/ssl_txt.c @@ -10,7 +10,7 @@ #include #include -#include "ssl_locl.h" +#include "ssl_local.h" #ifndef OPENSSL_NO_STDIO int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x) diff --git a/ssl/ssl_utst.c b/ssl/ssl_utst.c index cea1bc2707a8353717d25a080dc58590d2df0308..487f56e539351ce651433da43cb8d8e12b04713b 100644 --- a/ssl/ssl_utst.c +++ b/ssl/ssl_utst.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "ssl_locl.h" +#include "ssl_local.h" #ifndef OPENSSL_NO_UNIT_TEST diff --git a/ssl/statem/README b/ssl/statem/README index 145c69db8d54c57171be214fd22e8b81b82e4910..86cc06637291105a8a85affe39e783dd29b3c59e 100644 --- a/ssl/statem/README +++ b/ssl/statem/README @@ -40,7 +40,7 @@ Conceptually the state machine component is designed as follows: | | | Core state machine code | |____________________________| - statem_locl.h ^ ^ + statem_local.h ^ ^ _________| |_______ | | _____________|____________ _____________|____________ diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c index 24410991b29996abcf30c189fbc8f927ba5d3578..ae3354c1bc3af9df828e6e0f61389ada7f478e49 100644 --- a/ssl/statem/extensions.c +++ b/ssl/statem/extensions.c @@ -10,8 +10,8 @@ #include #include "internal/nelem.h" #include "internal/cryptlib.h" -#include "../ssl_locl.h" -#include "statem_locl.h" +#include "../ssl_local.h" +#include "statem_local.h" #include "internal/cryptlib.h" static int final_renegotiate(SSL *s, unsigned int context, int sent); @@ -94,7 +94,7 @@ typedef struct extensions_definition_st { /* * Definitions of all built-in extensions. NOTE: Changes in the number or order * of these extensions should be mirrored with equivalent changes to the - * indexes ( TLSEXT_IDX_* ) defined in ssl_locl.h. + * indexes ( TLSEXT_IDX_* ) defined in ssl_local.h. * Each extension has an initialiser, a client and * server side parser and a finaliser. The initialiser is called (if the * extension is relevant to the given context) even if we did not see the diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c index f0ae642fa09857f2772aeac7fd815a709891b91b..bcce0f1d9534b054506e264452f2ee759c2c5355 100644 --- a/ssl/statem/extensions_clnt.c +++ b/ssl/statem/extensions_clnt.c @@ -8,9 +8,9 @@ */ #include -#include "../ssl_locl.h" +#include "../ssl_local.h" #include "internal/cryptlib.h" -#include "statem_locl.h" +#include "statem_local.h" EXT_RETURN tls_construct_ctos_renegotiate(SSL *s, WPACKET *pkt, unsigned int context, X509 *x, diff --git a/ssl/statem/extensions_cust.c b/ssl/statem/extensions_cust.c index a4cdc81d68b9226b66baf31728e2e890c856dec8..a0ba18efa704740bc96945456f44b47461535e54 100644 --- a/ssl/statem/extensions_cust.c +++ b/ssl/statem/extensions_cust.c @@ -10,9 +10,9 @@ /* Custom extension utility functions */ #include -#include "../ssl_locl.h" +#include "../ssl_local.h" #include "internal/cryptlib.h" -#include "statem_locl.h" +#include "statem_local.h" typedef struct { void *add_arg; diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c index ab5453f63eccdb2197ad5eead52556218c706bc3..de273a3b969afbc05ec2a8e36595b16130704733 100644 --- a/ssl/statem/extensions_srvr.c +++ b/ssl/statem/extensions_srvr.c @@ -8,8 +8,8 @@ */ #include -#include "../ssl_locl.h" -#include "statem_locl.h" +#include "../ssl_local.h" +#include "statem_local.h" #include "internal/cryptlib.h" #define COOKIE_STATE_FORMAT_VERSION 0 diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index e3c5ec003874bb1a042e9153d6369127e4610d56..20f5bd584e6c596584c6463abeb9243a03b75ee4 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -9,8 +9,8 @@ #include "internal/cryptlib.h" #include -#include "../ssl_locl.h" -#include "statem_locl.h" +#include "../ssl_local.h" +#include "statem_local.h" #include /* diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 6410414fb64a661db6eb4e6bb452535a422abd56..64e392cfbfc77219552ada4166481595474a30cd 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -12,8 +12,8 @@ #include #include #include -#include "../ssl_locl.h" -#include "statem_locl.h" +#include "../ssl_local.h" +#include "statem_local.h" #include #include #include diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c index b016fa7cff74ebed9eb94d768affd7e8c7c35eb4..8e3fb686ee272febdfa310ace089b4c7631b1c23 100644 --- a/ssl/statem/statem_dtls.c +++ b/ssl/statem/statem_dtls.c @@ -10,8 +10,8 @@ #include #include #include -#include "../ssl_locl.h" -#include "statem_locl.h" +#include "../ssl_local.h" +#include "statem_local.h" #include "internal/cryptlib.h" #include #include diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c index 22e9f0490e2d943fae061701a524c391c3042bee..ed52b18d3ad5b500deb77eb53a37c22c1f86f81e 100644 --- a/ssl/statem/statem_lib.c +++ b/ssl/statem/statem_lib.c @@ -11,8 +11,8 @@ #include #include #include -#include "../ssl_locl.h" -#include "statem_locl.h" +#include "../ssl_local.h" +#include "statem_local.h" #include "internal/cryptlib.h" #include #include diff --git a/ssl/statem/statem_locl.h b/ssl/statem/statem_local.h similarity index 100% rename from ssl/statem/statem_locl.h rename to ssl/statem/statem_local.h diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 8cf9c40d15c007a96a0c9ca27926fa8f17265cfc..48142f3b8aabf3fc1e4c8c7e35d04707805ae008 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -10,9 +10,9 @@ */ #include -#include "../ssl_locl.h" -#include "statem_locl.h" -#include "internal/constant_time_locl.h" +#include "../ssl_local.h" +#include "statem_local.h" +#include "internal/constant_time.h" #include "internal/cryptlib.h" #include #include diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index 57fb17a66031b7be1550ff05679435077e2c679c..9a9cbe18353c7227f63d62f16e033e6c34ea168a 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -9,7 +9,7 @@ */ #include -#include "ssl_locl.h" +#include "ssl_local.h" #include #include #include diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index b482019c4c17f9e0f2fe6d59e218bab47124554c..9a6328449fed6701cdc4daacb9014d170a4ac71b 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -18,7 +18,7 @@ #include #include #include "internal/nelem.h" -#include "ssl_locl.h" +#include "ssl_local.h" #include static const SIGALG_LOOKUP *find_sig_alg(SSL *s, X509 *x, EVP_PKEY *pkey); diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index be3039af38223d26058a3a374d084ec320ce5534..0559fba9d993468c6895c8a5d26b2a95da3cc47d 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "ssl_locl.h" +#include "ssl_local.h" #ifndef OPENSSL_NO_SSL_TRACE diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c index b5f57a02f747f246727c636f466ce4e3877ca943..36de1943efe0ec42614ed247661df28e2a37a363 100644 --- a/ssl/tls13_enc.c +++ b/ssl/tls13_enc.c @@ -8,7 +8,7 @@ */ #include -#include "ssl_locl.h" +#include "ssl_local.h" #include "internal/cryptlib.h" #include #include diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c index f94e46b4e872c0c0b5585ee9847205ea9aa8f652..ede7427ff89dbdb6b983cacacb356732b847d357 100644 --- a/ssl/tls_srp.c +++ b/ssl/tls_srp.c @@ -14,7 +14,7 @@ #include #include #include -#include "ssl_locl.h" +#include "ssl_local.h" #ifndef OPENSSL_NO_SRP # include diff --git a/test/asynciotest.c b/test/asynciotest.c index 5e85cbb044a2e0175312e049b66e7c5b9021bf52..5a12d013444f42282bc075079a76ed18e336bf9d 100644 --- a/test/asynciotest.c +++ b/test/asynciotest.c @@ -13,7 +13,7 @@ #include #include -#include "../ssl/packet_locl.h" +#include "../ssl/packet_local.h" #include "ssltestlib.h" #include "testutil.h" diff --git a/test/bad_dtls_test.c b/test/bad_dtls_test.c index 1c836b9c17cb416f2d817ba970de20a63ef08480..e06206b6acdd9a7bc16037b7896531d73e127a69 100644 --- a/test/bad_dtls_test.c +++ b/test/bad_dtls_test.c @@ -37,7 +37,7 @@ #include #include #include -#include "../ssl/packet_locl.h" +#include "../ssl/packet_local.h" #include "internal/nelem.h" #include "testutil.h" diff --git a/test/cipher_overhead_test.c b/test/cipher_overhead_test.c index f8c6fd738e56b64fca4d5a27bb25b836aeb4b981..2275fceda0c5b3d17cee19103f87b477a0811c1a 100644 --- a/test/cipher_overhead_test.c +++ b/test/cipher_overhead_test.c @@ -15,7 +15,7 @@ # pragma names as_is,shortened #endif -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" #ifdef __VMS # pragma names restore diff --git a/test/clienthellotest.c b/test/clienthellotest.c index 862ca9ff6c26354357021be2a3a4ffc86bdbd412..8ae1e4d9c6425f094ea67869a0549e3f41377adb 100644 --- a/test/clienthellotest.c +++ b/test/clienthellotest.c @@ -17,7 +17,7 @@ #include #include -#include "../ssl/packet_locl.h" +#include "../ssl/packet_local.h" #include "testutil.h" diff --git a/test/constant_time_test.c b/test/constant_time_test.c index e5e3e497c09945e08ba3f4c939e1af49986d1662..25f53928014ad160f7991abfd10680c31d8fc89b 100644 --- a/test/constant_time_test.c +++ b/test/constant_time_test.c @@ -11,7 +11,7 @@ #include #include "internal/nelem.h" -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" #include "testutil.h" #include "internal/numbers.h" diff --git a/test/curve448_internal_test.c b/test/curve448_internal_test.c index e7d4378527b1c4ad967727bd7303e1250dc8ec24..4b65ee3fadd87001a83a5996fdddc22095c36d5d 100644 --- a/test/curve448_internal_test.c +++ b/test/curve448_internal_test.c @@ -16,7 +16,7 @@ # pragma names as_is,shortened #endif -#include "curve448_lcl.h" +#include "curve448_local.h" #ifdef __VMS # pragma names restore diff --git a/test/drbg_cavs_test.c b/test/drbg_cavs_test.c index eea387b4f950316d3fb7ba2fad0bb1a62cf8ecf3..4573e2b0b796d514d53ec22700b17b156186b914 100644 --- a/test/drbg_cavs_test.c +++ b/test/drbg_cavs_test.c @@ -15,7 +15,7 @@ #include #include #include -#include "../crypto/rand/rand_lcl.h" +#include "../crypto/rand/rand_local.h" #include "testutil.h" #include "drbg_cavs_data.h" diff --git a/test/drbgtest.c b/test/drbgtest.c index 9f04a68f0e6556ca5a4fad5c23f1c4d68fcf3267..2aff4aaf030d13950efb99685363a75dc419c15e 100644 --- a/test/drbgtest.c +++ b/test/drbgtest.c @@ -15,7 +15,7 @@ #include #include #include -#include "../crypto/rand/rand_lcl.h" +#include "../crypto/rand/rand_local.h" #include "../include/crypto/rand.h" #if defined(_WIN32) diff --git a/test/dtls_mtu_test.c b/test/dtls_mtu_test.c index 3aa519f156bec5c2bba8777c91d127e04b14ba3f..f20edf02d2f5dd6dfb374d3da3312d574bc9aa9a 100644 --- a/test/dtls_mtu_test.c +++ b/test/dtls_mtu_test.c @@ -18,7 +18,7 @@ #include "testutil.h" /* for SSL_READ_ETM() */ -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" static int debug = 0; diff --git a/test/ec_internal_test.c b/test/ec_internal_test.c index 8d3a4fdd67ce2750990ffc40b51180833f570314..4b849312be7820e138a2e70bdb5368c93ca13d55 100644 --- a/test/ec_internal_test.c +++ b/test/ec_internal_test.c @@ -10,7 +10,7 @@ #include "internal/nelem.h" #include "testutil.h" #include -#include "ec_lcl.h" +#include "ec_local.h" #include static size_t crv_len = 0; diff --git a/test/handshake_helper.c b/test/handshake_helper.c index 27ff794014d7c082a7ffbdd7cf87de059927523c..1742004b5b80699793e4da574996ce01ec5011e1 100644 --- a/test/handshake_helper.c +++ b/test/handshake_helper.c @@ -16,7 +16,7 @@ #include #endif -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" #include "internal/sockets.h" #include "internal/nelem.h" #include "handshake_helper.h" diff --git a/test/modes_internal_test.c b/test/modes_internal_test.c index e0f1adf6af2c94bd579fbc05738126564e987303..a0fa86e6238c1f54790c9cef35711d03e63e0769 100644 --- a/test/modes_internal_test.c +++ b/test/modes_internal_test.c @@ -14,7 +14,7 @@ #include #include -#include "../crypto/modes/modes_lcl.h" +#include "../crypto/modes/modes_local.h" #include "testutil.h" #include "internal/nelem.h" diff --git a/test/packettest.c b/test/packettest.c index e58d8d8bcfaa473d16af1d604785bc2b6bf8da1b..6c82d04414c3d22f3dd395ab3e9d4ad947701c44 100644 --- a/test/packettest.c +++ b/test/packettest.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "../ssl/packet_locl.h" +#include "../ssl/packet_local.h" #include "testutil.h" #define BUF_LEN 255 diff --git a/test/servername_test.c b/test/servername_test.c index d246918d6640dbbf172fcad0e785281fbc94d700..39f6b2002f32c46818ce55a9dbd3ec8ab56cad38 100644 --- a/test/servername_test.c +++ b/test/servername_test.c @@ -18,7 +18,7 @@ #include #include -#include "../ssl/packet_locl.h" +#include "../ssl/packet_local.h" #include "testutil.h" #include "internal/nelem.h" diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c index 2104e8c5163a5d7f281a80bb2c207777c8fda355..cb1e076bced0d41946ae208d90f94d721be81a1c 100644 --- a/test/ssl_cert_table_internal_test.c +++ b/test/ssl_cert_table_internal_test.c @@ -21,7 +21,7 @@ # pragma names as_is,shortened #endif -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" #include "../ssl/ssl_cert_table.h" #ifdef __VMS diff --git a/test/sslapitest.c b/test/sslapitest.c index 7a142268fa764ab1a8cb390d504d71e997f20413..76a8ca23daa8187b06866247587157741dec7438 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -22,7 +22,7 @@ #include "testutil.h" #include "testutil/output.h" #include "internal/nelem.h" -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" #ifndef OPENSSL_NO_TLS1_3 diff --git a/test/sslbuffertest.c b/test/sslbuffertest.c index b8b1f52dde1d875eff11d2edd21cf528e7b4d9a6..b5f815f7dbc926bdbd54dfe732839e0a63f88b8d 100644 --- a/test/sslbuffertest.c +++ b/test/sslbuffertest.c @@ -13,7 +13,7 @@ #include #include -#include "../ssl/packet_locl.h" +#include "../ssl/packet_local.h" #include "ssltestlib.h" #include "testutil.h" diff --git a/test/tls13ccstest.c b/test/tls13ccstest.c index 92e9d598ca7fbac3fbf3a551ee9dc97886edb084..1633d3afe502f1f9867348077e76edf9eb352629 100644 --- a/test/tls13ccstest.c +++ b/test/tls13ccstest.c @@ -11,7 +11,7 @@ #include #include "ssltestlib.h" #include "testutil.h" -#include "../ssl/packet_locl.h" +#include "../ssl/packet_local.h" static char *cert = NULL; static char *privkey = NULL; diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c index 6f359b3a2f6eb4efd9ae023c2e8cee0b027509ce..479ff4105e5237e2bb623b9419f64344cb538e65 100644 --- a/test/tls13encryptiontest.c +++ b/test/tls13encryptiontest.c @@ -15,8 +15,8 @@ # pragma names as_is,shortened #endif -#include "../ssl/ssl_locl.h" -#include "../ssl/record/record_locl.h" +#include "../ssl/ssl_local.h" +#include "../ssl/record/record_local.h" #ifdef __VMS # pragma names restore diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c index 9368b1cdc5391656b349403c271abcc13a33bda2..52fc2b667361eebd8b331f88eceeed3b560b230a 100644 --- a/test/tls13secretstest.c +++ b/test/tls13secretstest.c @@ -15,7 +15,7 @@ # pragma names as_is,shortened #endif -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" #ifdef __VMS # pragma names restore diff --git a/test/wpackettest.c b/test/wpackettest.c index 773eef052525188b6e3f035ec7a33956b36c5d7c..4c779c875c2ecc6431b55847f17da169adf44feb 100644 --- a/test/wpackettest.c +++ b/test/wpackettest.c @@ -15,7 +15,7 @@ # pragma names as_is,shortened #endif -#include "../ssl/packet_locl.h" +#include "../ssl/packet_local.h" #ifdef __VMS # pragma names restore