From df3d1f83f7626d4dcd472aac5474efbc2f193ebb Mon Sep 17 00:00:00 2001
From: Flavio Ceolin <flavio.ceolin@intel.com>
Date: Fri, 11 Feb 2022 20:13:11 -0800
Subject: [PATCH] drivers: crypto: Rename cipher file

This file defines the crypto driver API, cipher is supposed to be just
one type of capability (other can be hash) of these drivers, just
change the file name to be consistent with it.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
---
 drivers/crypto/crypto_ataes132a.c              | 2 +-
 drivers/crypto/crypto_mtls_shim.c              | 2 +-
 drivers/crypto/crypto_nrf_ecb.c                | 2 +-
 drivers/crypto/crypto_stm32.c                  | 2 +-
 drivers/crypto/crypto_tc_shim.c                | 2 +-
 drivers/ieee802154/ieee802154_cc2520.c         | 2 +-
 include/crypto/{cipher.h => crypto.h}          | 6 +++---
 samples/drivers/crypto/src/main.c              | 2 +-
 subsys/mgmt/osdp/src/osdp_common.c             | 2 +-
 subsys/net/l2/ieee802154/ieee802154_security.c | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)
 rename include/crypto/{cipher.h => crypto.h} (98%)

diff --git a/drivers/crypto/crypto_ataes132a.c b/drivers/crypto/crypto_ataes132a.c
index 956424acc8a..1579275fd47 100644
--- a/drivers/crypto/crypto_ataes132a.c
+++ b/drivers/crypto/crypto_ataes132a.c
@@ -10,7 +10,7 @@
 #include <device.h>
 #include <drivers/i2c.h>
 #include <sys/__assert.h>
-#include <crypto/cipher.h>
+#include <crypto/crypto.h>
 
 #include "crypto_ataes132a_priv.h"
 
diff --git a/drivers/crypto/crypto_mtls_shim.c b/drivers/crypto/crypto_mtls_shim.c
index 6fc9ab74e72..d58ce51bac4 100644
--- a/drivers/crypto/crypto_mtls_shim.c
+++ b/drivers/crypto/crypto_mtls_shim.c
@@ -12,7 +12,7 @@
 #include <kernel.h>
 #include <init.h>
 #include <errno.h>
-#include <crypto/cipher.h>
+#include <crypto/crypto.h>
 
 #if !defined(CONFIG_MBEDTLS_CFG_FILE)
 #include "mbedtls/config.h"
diff --git a/drivers/crypto/crypto_nrf_ecb.c b/drivers/crypto/crypto_nrf_ecb.c
index b1fe2caad33..49144fcfa09 100644
--- a/drivers/crypto/crypto_nrf_ecb.c
+++ b/drivers/crypto/crypto_nrf_ecb.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <crypto/cipher.h>
+#include <crypto/crypto.h>
 #include <logging/log.h>
 #include <hal/nrf_ecb.h>
 
diff --git a/drivers/crypto/crypto_stm32.c b/drivers/crypto/crypto_stm32.c
index b59e1f2f6df..5dcfa2a0037 100644
--- a/drivers/crypto/crypto_stm32.c
+++ b/drivers/crypto/crypto_stm32.c
@@ -8,7 +8,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <sys/__assert.h>
-#include <crypto/cipher.h>
+#include <crypto/crypto.h>
 #include <drivers/clock_control/stm32_clock_control.h>
 #include <drivers/clock_control.h>
 #include <sys/byteorder.h>
diff --git a/drivers/crypto/crypto_tc_shim.c b/drivers/crypto/crypto_tc_shim.c
index f58518c3a6d..51ec5e27f94 100644
--- a/drivers/crypto/crypto_tc_shim.c
+++ b/drivers/crypto/crypto_tc_shim.c
@@ -14,7 +14,7 @@
 #include <tinycrypt/constants.h>
 #include <tinycrypt/utils.h>
 #include <string.h>
-#include <crypto/cipher.h>
+#include <crypto/crypto.h>
 #include "crypto_tc_shim_priv.h"
 
 #define LOG_LEVEL CONFIG_CRYPTO_LOG_LEVEL
diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c
index ace693504fb..6285fb09041 100644
--- a/drivers/ieee802154/ieee802154_cc2520.c
+++ b/drivers/ieee802154/ieee802154_cc2520.c
@@ -33,7 +33,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 
 #ifdef CONFIG_IEEE802154_CC2520_CRYPTO
 
-#include <crypto/cipher.h>
+#include <crypto/crypto.h>
 #include <crypto/cipher_structs.h>
 
 #endif /* CONFIG_IEEE802154_CC2520_CRYPTO */
diff --git a/include/crypto/cipher.h b/include/crypto/crypto.h
similarity index 98%
rename from include/crypto/cipher.h
rename to include/crypto/crypto.h
index 07c86f182e7..967ec0029aa 100644
--- a/include/crypto/cipher.h
+++ b/include/crypto/crypto.h
@@ -14,8 +14,8 @@
  * as a part of ongoing development.
  */
 
-#ifndef ZEPHYR_INCLUDE_CRYPTO_CIPHER_H_
-#define ZEPHYR_INCLUDE_CRYPTO_CIPHER_H_
+#ifndef ZEPHYR_INCLUDE_CRYPTO_H_
+#define ZEPHYR_INCLUDE_CRYPTO_H_
 
 #include <device.h>
 #include <errno.h>
@@ -311,4 +311,4 @@ static inline int cipher_gcm_op(struct cipher_ctx *ctx,
  * @}
  */
 
-#endif /* ZEPHYR_INCLUDE_CRYPTO_CIPHER_H_ */
+#endif /* ZEPHYR_INCLUDE_CRYPTO_H_ */
diff --git a/samples/drivers/crypto/src/main.c b/samples/drivers/crypto/src/main.c
index ddb062156eb..5c92c5aaa55 100644
--- a/samples/drivers/crypto/src/main.c
+++ b/samples/drivers/crypto/src/main.c
@@ -11,7 +11,7 @@
 #include <device.h>
 #include <zephyr.h>
 #include <string.h>
-#include <crypto/cipher.h>
+#include <crypto/crypto.h>
 
 #define LOG_LEVEL CONFIG_CRYPTO_LOG_LEVEL
 #include <logging/log.h>
diff --git a/subsys/mgmt/osdp/src/osdp_common.c b/subsys/mgmt/osdp/src/osdp_common.c
index 8e429e37b5a..38fd133afbe 100644
--- a/subsys/mgmt/osdp/src/osdp_common.c
+++ b/subsys/mgmt/osdp/src/osdp_common.c
@@ -11,7 +11,7 @@
 #include <logging/log.h>
 
 #ifdef CONFIG_OSDP_SC_ENABLED
-#include <crypto/cipher.h>
+#include <crypto/crypto.h>
 #include <random/rand32.h>
 #endif
 
diff --git a/subsys/net/l2/ieee802154/ieee802154_security.c b/subsys/net/l2/ieee802154/ieee802154_security.c
index b7d06a65e8a..0142916ea14 100644
--- a/subsys/net/l2/ieee802154/ieee802154_security.c
+++ b/subsys/net/l2/ieee802154/ieee802154_security.c
@@ -8,7 +8,7 @@
 LOG_MODULE_REGISTER(net_ieee802154_security,
 		    CONFIG_NET_L2_IEEE802154_LOG_LEVEL);
 
-#include <crypto/cipher.h>
+#include <crypto/crypto.h>
 #include <net/net_core.h>
 
 #include "ieee802154_frame.h"