summaryrefslogtreecommitdiffstats
path: root/providers/common
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-09-28 00:45:40 +0200
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2019-09-28 20:26:35 +0200
commit706457b7bda7fdbab426b8dce83b318908339da4 (patch)
tree0df00f68b06fdeeef553c353a44e25e3d979b2f2 /providers/common
parent25f2138b0ab54a65ba713c093ca3734d88f7cb51 (diff)
Reorganize local header files
Apart from public and internal header files, there is a third type called local header files, which are located next to source files in the source directory. Currently, they have different suffixes like '*_lcl.h', '*_local.h', or '*_int.h' This commit changes the different suffixes to '*_local.h' uniformly. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9333)
Diffstat (limited to 'providers/common')
-rw-r--r--providers/common/ciphers/block.c2
-rw-r--r--providers/common/ciphers/cipher_aes_ccm.c2
-rw-r--r--providers/common/ciphers/cipher_aes_ccm_hw.c2
-rw-r--r--providers/common/ciphers/cipher_aes_gcm.c2
-rw-r--r--providers/common/ciphers/cipher_aes_gcm_hw.c2
-rw-r--r--providers/common/ciphers/cipher_ccm.c2
-rw-r--r--providers/common/ciphers/cipher_common.c2
-rw-r--r--providers/common/ciphers/cipher_common_hw.c2
-rw-r--r--providers/common/ciphers/cipher_gcm.c2
-rw-r--r--providers/common/ciphers/cipher_gcm_hw.c2
-rw-r--r--providers/common/ciphers/cipher_local.h (renamed from providers/common/ciphers/cipher_locl.h)0
-rw-r--r--providers/common/ciphers/cipher_tdes.c2
-rw-r--r--providers/common/ciphers/cipher_tdes_hw.c2
13 files changed, 12 insertions, 12 deletions
diff --git a/providers/common/ciphers/block.c b/providers/common/ciphers/block.c
index a53e9255c9..ec2dab6849 100644
--- a/providers/common/ciphers/block.c
+++ b/providers/common/ciphers/block.c
@@ -8,7 +8,7 @@
*/
#include <assert.h>
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/providercommonerr.h"
/*
diff --git a/providers/common/ciphers/cipher_aes_ccm.c b/providers/common/ciphers/cipher_aes_ccm.c
index 75f6e3fc9d..c8015898dd 100644
--- a/providers/common/ciphers/cipher_aes_ccm.c
+++ b/providers/common/ciphers/cipher_aes_ccm.c
@@ -9,7 +9,7 @@
/* Dispatch functions for AES CCM mode */
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/ciphers/cipher_ccm.h"
#include "internal/provider_algs.h"
diff --git a/providers/common/ciphers/cipher_aes_ccm_hw.c b/providers/common/ciphers/cipher_aes_ccm_hw.c
index f445cb73b7..ba7ce4dcab 100644
--- a/providers/common/ciphers/cipher_aes_ccm_hw.c
+++ b/providers/common/ciphers/cipher_aes_ccm_hw.c
@@ -9,7 +9,7 @@
/* AES CCM mode */
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/ciphers/cipher_ccm.h"
#define AES_HW_CCM_SET_KEY_FN(fn_set_enc_key, fn_blk, fn_ccm_enc, fn_ccm_dec) \
diff --git a/providers/common/ciphers/cipher_aes_gcm.c b/providers/common/ciphers/cipher_aes_gcm.c
index 69c98f4e13..ba03bed590 100644
--- a/providers/common/ciphers/cipher_aes_gcm.c
+++ b/providers/common/ciphers/cipher_aes_gcm.c
@@ -9,7 +9,7 @@
/* Dispatch functions for AES GCM mode */
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/ciphers/cipher_gcm.h"
#include "internal/provider_algs.h"
diff --git a/providers/common/ciphers/cipher_aes_gcm_hw.c b/providers/common/ciphers/cipher_aes_gcm_hw.c
index 3f56e6861d..5263bdd6dd 100644
--- a/providers/common/ciphers/cipher_aes_gcm_hw.c
+++ b/providers/common/ciphers/cipher_aes_gcm_hw.c
@@ -9,7 +9,7 @@
/* Dispatch functions for AES GCM mode */
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/ciphers/cipher_gcm.h"
static int generic_aes_gcm_initkey(PROV_GCM_CTX *ctx, const unsigned char *key,
diff --git a/providers/common/ciphers/cipher_ccm.c b/providers/common/ciphers/cipher_ccm.c
index 9c58dfeafa..cc37b49c60 100644
--- a/providers/common/ciphers/cipher_ccm.c
+++ b/providers/common/ciphers/cipher_ccm.c
@@ -9,7 +9,7 @@
/* Dispatch functions for ccm mode */
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/ciphers/cipher_ccm.h"
#include "internal/providercommonerr.h"
diff --git a/providers/common/ciphers/cipher_common.c b/providers/common/ciphers/cipher_common.c
index 3c45dd5b9a..34407879e6 100644
--- a/providers/common/ciphers/cipher_common.c
+++ b/providers/common/ciphers/cipher_common.c
@@ -11,7 +11,7 @@
* Generic dispatch table functions for ciphers.
*/
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/provider_ctx.h"
#include "internal/providercommonerr.h"
diff --git a/providers/common/ciphers/cipher_common_hw.c b/providers/common/ciphers/cipher_common_hw.c
index 5a3fb3060b..6f1b4babd8 100644
--- a/providers/common/ciphers/cipher_common_hw.c
+++ b/providers/common/ciphers/cipher_common_hw.c
@@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
-#include "cipher_locl.h"
+#include "cipher_local.h"
/*-
* The generic cipher functions for cipher modes cbc, ecb, ofb, cfb and ctr.
diff --git a/providers/common/ciphers/cipher_gcm.c b/providers/common/ciphers/cipher_gcm.c
index 09cd70cc53..137ad5029c 100644
--- a/providers/common/ciphers/cipher_gcm.c
+++ b/providers/common/ciphers/cipher_gcm.c
@@ -9,7 +9,7 @@
/* Dispatch functions for gcm mode */
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/ciphers/cipher_gcm.h"
#include "internal/providercommonerr.h"
#include "crypto/rand.h"
diff --git a/providers/common/ciphers/cipher_gcm_hw.c b/providers/common/ciphers/cipher_gcm_hw.c
index 8b2913c695..1d9c3ea49c 100644
--- a/providers/common/ciphers/cipher_gcm_hw.c
+++ b/providers/common/ciphers/cipher_gcm_hw.c
@@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/ciphers/cipher_gcm.h"
diff --git a/providers/common/ciphers/cipher_locl.h b/providers/common/ciphers/cipher_local.h
index cc37a348ed..cc37a348ed 100644
--- a/providers/common/ciphers/cipher_locl.h
+++ b/providers/common/ciphers/cipher_local.h
diff --git a/providers/common/ciphers/cipher_tdes.c b/providers/common/ciphers/cipher_tdes.c
index 0548531678..004ebc7269 100644
--- a/providers/common/ciphers/cipher_tdes.c
+++ b/providers/common/ciphers/cipher_tdes.c
@@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/ciphers/cipher_tdes.h"
#include "crypto/rand.h"
#include "internal/provider_algs.h"
diff --git a/providers/common/ciphers/cipher_tdes_hw.c b/providers/common/ciphers/cipher_tdes_hw.c
index 92b6de2422..10ba5a24da 100644
--- a/providers/common/ciphers/cipher_tdes_hw.c
+++ b/providers/common/ciphers/cipher_tdes_hw.c
@@ -7,7 +7,7 @@
* https://www.openssl.org/source/license.html
*/
-#include "cipher_locl.h"
+#include "cipher_local.h"
#include "internal/ciphers/cipher_tdes.h"
#define ks1 tks.ks[0]