Skip to content

L
linux
Commit 9911bac0 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files
Options

staging: ccree: amend aead func def for readability 

Func definitions in the aead implementation were did not adhere to
coding style. Fix them for better readability.
Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a05db75c
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 90 deletions
drivers/staging/ccree/ssi_aead.c
View file @ 9911bac0
...@@ -678,9 +678,8 @@ static int cc_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key, ...@@ -678,9 +678,8 @@ static int cc_rfc4309_ccm_setkey(struct crypto_aead *tfm, const u8 *key,
} }
#endif /*SSI_CC_HAS_AES_CCM*/ #endif /*SSI_CC_HAS_AES_CCM*/
static int cc_aead_setauthsize( static int cc_aead_setauthsize(struct crypto_aead *authenc,
struct crypto_aead *authenc, unsigned int authsize)
unsigned int authsize)
{ {
struct cc_aead_ctx *ctx = crypto_aead_ctx(authenc); struct cc_aead_ctx *ctx = crypto_aead_ctx(authenc);
struct device *dev = drvdata_to_dev(ctx->drvdata); struct device *dev = drvdata_to_dev(ctx->drvdata);
...@@ -733,12 +732,8 @@ static int cc_ccm_setauthsize(struct crypto_aead *authenc, ...@@ -733,12 +732,8 @@ static int cc_ccm_setauthsize(struct crypto_aead *authenc,
} }
#endif /*SSI_CC_HAS_AES_CCM*/ #endif /*SSI_CC_HAS_AES_CCM*/
static void static void cc_set_assoc_desc(struct aead_request *areq, unsigned int flow_mode,
cc_set_assoc_desc( struct cc_hw_desc desc[], unsigned int *seq_size)
struct aead_request *areq,
unsigned int flow_mode,
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(areq); struct crypto_aead *tfm = crypto_aead_reqtfm(areq);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -776,13 +771,10 @@ cc_set_assoc_desc( ...@@ -776,13 +771,10 @@ cc_set_assoc_desc(
*seq_size = (++idx); *seq_size = (++idx);
} }
static void static void cc_proc_authen_desc(struct aead_request *areq,
cc_proc_authen_desc( unsigned int flow_mode,
struct aead_request *areq, struct cc_hw_desc desc[],
unsigned int flow_mode, unsigned int *seq_size, int direct)
struct cc_hw_desc desc[],
unsigned int *seq_size,
int direct)
{ {
struct aead_req_ctx *areq_ctx = aead_request_ctx(areq); struct aead_req_ctx *areq_ctx = aead_request_ctx(areq);
enum ssi_req_dma_buf_type data_dma_type = areq_ctx->data_buff_type; enum ssi_req_dma_buf_type data_dma_type = areq_ctx->data_buff_type;
...@@ -843,12 +835,10 @@ cc_proc_authen_desc( ...@@ -843,12 +835,10 @@ cc_proc_authen_desc(
*seq_size = (++idx); *seq_size = (++idx);
} }
static void static void cc_proc_cipher_desc(struct aead_request *areq,
cc_proc_cipher_desc( unsigned int flow_mode,
struct aead_request *areq, struct cc_hw_desc desc[],
unsigned int flow_mode, unsigned int *seq_size)
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
unsigned int idx = *seq_size; unsigned int idx = *seq_size;
struct aead_req_ctx *areq_ctx = aead_request_ctx(areq); struct aead_req_ctx *areq_ctx = aead_request_ctx(areq);
...@@ -891,10 +881,9 @@ cc_proc_cipher_desc( ...@@ -891,10 +881,9 @@ cc_proc_cipher_desc(
*seq_size = (++idx); *seq_size = (++idx);
} }
static void cc_proc_digest_desc( static void cc_proc_digest_desc(struct aead_request *req,
struct aead_request *req, struct cc_hw_desc desc[],
struct cc_hw_desc desc[], unsigned int *seq_size)
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -942,10 +931,9 @@ static void cc_proc_digest_desc( ...@@ -942,10 +931,9 @@ static void cc_proc_digest_desc(
*seq_size = (++idx); *seq_size = (++idx);
} }
static void cc_set_cipher_desc( static void cc_set_cipher_desc(struct aead_request *req,
struct aead_request *req, struct cc_hw_desc desc[],
struct cc_hw_desc desc[], unsigned int *seq_size)
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -988,11 +976,8 @@ static void cc_set_cipher_desc( ...@@ -988,11 +976,8 @@ static void cc_set_cipher_desc(
*seq_size = idx; *seq_size = idx;
} }
static void cc_proc_cipher( static void cc_proc_cipher(struct aead_request *req, struct cc_hw_desc desc[],
struct aead_request *req, unsigned int *seq_size, unsigned int data_flow_mode)
struct cc_hw_desc desc[],
unsigned int *seq_size,
unsigned int data_flow_mode)
{ {
struct aead_req_ctx *req_ctx = aead_request_ctx(req); struct aead_req_ctx *req_ctx = aead_request_ctx(req);
int direct = req_ctx->gen_ctx.op_type; int direct = req_ctx->gen_ctx.op_type;
...@@ -1014,10 +999,8 @@ static void cc_proc_cipher( ...@@ -1014,10 +999,8 @@ static void cc_proc_cipher(
*seq_size = idx; *seq_size = idx;
} }
static void cc_set_hmac_desc( static void cc_set_hmac_desc(struct aead_request *req, struct cc_hw_desc desc[],
struct aead_request *req, unsigned int *seq_size)
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -1051,10 +1034,8 @@ static void cc_set_hmac_desc( ...@@ -1051,10 +1034,8 @@ static void cc_set_hmac_desc(
*seq_size = idx; *seq_size = idx;
} }
static void cc_set_xcbc_desc( static void cc_set_xcbc_desc(struct aead_request *req, struct cc_hw_desc desc[],
struct aead_request *req, unsigned int *seq_size)
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -1113,10 +1094,9 @@ static void cc_set_xcbc_desc( ...@@ -1113,10 +1094,9 @@ static void cc_set_xcbc_desc(
*seq_size = idx; *seq_size = idx;
} }
static void cc_proc_header_desc( static void cc_proc_header_desc(struct aead_request *req,
struct aead_request *req, struct cc_hw_desc desc[],
struct cc_hw_desc desc[], unsigned int *seq_size)
unsigned int *seq_size)
{ {
unsigned int idx = *seq_size; unsigned int idx = *seq_size;
/* Hash associated data */ /* Hash associated data */
...@@ -1127,10 +1107,9 @@ static void cc_proc_header_desc( ...@@ -1127,10 +1107,9 @@ static void cc_proc_header_desc(
*seq_size = idx; *seq_size = idx;
} }
static void cc_proc_scheme_desc( static void cc_proc_scheme_desc(struct aead_request *req,
struct aead_request *req, struct cc_hw_desc desc[],
struct cc_hw_desc desc[], unsigned int *seq_size)
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -1192,10 +1171,8 @@ static void cc_proc_scheme_desc( ...@@ -1192,10 +1171,8 @@ static void cc_proc_scheme_desc(
*seq_size = idx; *seq_size = idx;
} }
static void cc_mlli_to_sram( static void cc_mlli_to_sram(struct aead_request *req,
struct aead_request *req, struct cc_hw_desc desc[], unsigned int *seq_size)
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
struct aead_req_ctx *req_ctx = aead_request_ctx(req); struct aead_req_ctx *req_ctx = aead_request_ctx(req);
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
...@@ -1221,10 +1198,9 @@ static void cc_mlli_to_sram( ...@@ -1221,10 +1198,9 @@ static void cc_mlli_to_sram(
} }
} }
static enum cc_flow_mode cc_get_data_flow( static enum cc_flow_mode cc_get_data_flow(enum drv_crypto_direction direct,
enum drv_crypto_direction direct, enum cc_flow_mode setup_flow_mode,
enum cc_flow_mode setup_flow_mode, bool is_single_pass)
bool is_single_pass)
{ {
enum cc_flow_mode data_flow_mode; enum cc_flow_mode data_flow_mode;
...@@ -1247,10 +1223,8 @@ static enum cc_flow_mode cc_get_data_flow( ...@@ -1247,10 +1223,8 @@ static enum cc_flow_mode cc_get_data_flow(
return data_flow_mode; return data_flow_mode;
} }
static void cc_hmac_authenc( static void cc_hmac_authenc(struct aead_request *req, struct cc_hw_desc desc[],
struct aead_request *req, unsigned int *seq_size)
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -1301,10 +1275,8 @@ static void cc_hmac_authenc( ...@@ -1301,10 +1275,8 @@ static void cc_hmac_authenc(
} }
static void static void
cc_xcbc_authenc( cc_xcbc_authenc(struct aead_request *req, struct cc_hw_desc desc[],
struct aead_request *req, unsigned int *seq_size)
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -1449,10 +1421,8 @@ static int set_msg_len(u8 *block, unsigned int msglen, unsigned int csize) ...@@ -1449,10 +1421,8 @@ static int set_msg_len(u8 *block, unsigned int msglen, unsigned int csize)
return 0; return 0;
} }
static int cc_ccm( static int cc_ccm(struct aead_request *req, struct cc_hw_desc desc[],
struct aead_request *req, unsigned int *seq_size)
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -1659,10 +1629,8 @@ static void cc_proc_rfc4309_ccm(struct aead_request *req) ...@@ -1659,10 +1629,8 @@ static void cc_proc_rfc4309_ccm(struct aead_request *req)
#if SSI_CC_HAS_AES_GCM #if SSI_CC_HAS_AES_GCM
static void cc_set_ghash_desc( static void cc_set_ghash_desc(struct aead_request *req,
struct aead_request *req, struct cc_hw_desc desc[], unsigned int *seq_size)
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -1739,10 +1707,8 @@ static void cc_set_ghash_desc( ...@@ -1739,10 +1707,8 @@ static void cc_set_ghash_desc(
*seq_size = idx; *seq_size = idx;
} }
static void cc_set_gctr_desc( static void cc_set_gctr_desc(struct aead_request *req, struct cc_hw_desc desc[],
struct aead_request *req, unsigned int *seq_size)
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -1777,10 +1743,9 @@ static void cc_set_gctr_desc( ...@@ -1777,10 +1743,9 @@ static void cc_set_gctr_desc(
*seq_size = idx; *seq_size = idx;
} }
static void cc_proc_gcm_result( static void cc_proc_gcm_result(struct aead_request *req,
struct aead_request *req, struct cc_hw_desc desc[],
struct cc_hw_desc desc[], unsigned int *seq_size)
unsigned int *seq_size)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
...@@ -1843,10 +1808,8 @@ static void cc_proc_gcm_result( ...@@ -1843,10 +1808,8 @@ static void cc_proc_gcm_result(
*seq_size = idx; *seq_size = idx;
} }
static int cc_gcm( static int cc_gcm(struct aead_request *req, struct cc_hw_desc desc[],
struct aead_request *req, unsigned int *seq_size)
struct cc_hw_desc desc[],
unsigned int *seq_size)
{ {
struct aead_req_ctx *req_ctx = aead_request_ctx(req); struct aead_req_ctx *req_ctx = aead_request_ctx(req);
unsigned int cipher_flow_mode; unsigned int cipher_flow_mode;
...@@ -1883,9 +1846,7 @@ static int cc_gcm( ...@@ -1883,9 +1846,7 @@ static int cc_gcm(
} }
#ifdef CC_DEBUG #ifdef CC_DEBUG
static void cc_dump_gcm( static void cc_dump_gcm(const char *title, struct aead_request *req)
const char *title,
struct aead_request *req)
{ {
struct crypto_aead *tfm = crypto_aead_reqtfm(req); struct crypto_aead *tfm = crypto_aead_reqtfm(req);
struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm); struct cc_aead_ctx *ctx = crypto_aead_ctx(tfm);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7