crypto: crypto4xx - move and refactor dynamic_contents helpers

This patch refactors and moves the dynamic_contents helper
functions into the crypto4xx_sa.h header file.

 * get_dynamic_sa_iv_size is no longer needed, as the cryptoapi
   provides the required IV size information as well.

 * refactor the function declarations to use the a pointer to the
   dynamic_sa_contents union, instead of the crypto4xx_ctx.

 * rename get_dynamic_sa_offset_key_field to get_dynamic_sa_key_field.
   It returns the pointer to the key directly.

Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Christian Lamparter
2017-08-25 15:47:20 +02:00
committed by Herbert Xu
parent 453e3090b9
commit 249c8d98ea
5 changed files with 39 additions and 99 deletions

View File

@@ -240,4 +240,32 @@ struct dynamic_sa_hash160 {
#define SA_HASH160_LEN (sizeof(struct dynamic_sa_hash160)/4)
#define SA_HASH160_CONTENTS 0x2000a502
static inline u32
get_dynamic_sa_offset_state_ptr_field(struct dynamic_sa_ctl *cts)
{
u32 offset;
offset = cts->sa_contents.bf.key_size
+ cts->sa_contents.bf.inner_size
+ cts->sa_contents.bf.outer_size
+ cts->sa_contents.bf.spi
+ cts->sa_contents.bf.seq_num0
+ cts->sa_contents.bf.seq_num1
+ cts->sa_contents.bf.seq_num_mask0
+ cts->sa_contents.bf.seq_num_mask1
+ cts->sa_contents.bf.seq_num_mask2
+ cts->sa_contents.bf.seq_num_mask3
+ cts->sa_contents.bf.iv0
+ cts->sa_contents.bf.iv1
+ cts->sa_contents.bf.iv2
+ cts->sa_contents.bf.iv3;
return sizeof(struct dynamic_sa_ctl) + offset * 4;
}
static inline u8 *get_dynamic_sa_key_field(struct dynamic_sa_ctl *cts)
{
return (u8 *) ((unsigned long)cts + sizeof(struct dynamic_sa_ctl));
}
#endif