Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
IPSEC: Pass the algorithm salt (used in GCM) over the API
[vpp.git]
/
src
/
vnet
/
ipsec
/
ipsec_sa.h
diff --git
a/src/vnet/ipsec/ipsec_sa.h
b/src/vnet/ipsec/ipsec_sa.h
index
66bdcc7
..
d1b44c3
100644
(file)
--- a/
src/vnet/ipsec/ipsec_sa.h
+++ b/
src/vnet/ipsec/ipsec_sa.h
@@
-43,6
+43,11
@@
typedef enum
IPSEC_CRYPTO_N_ALG,
} ipsec_crypto_alg_t;
IPSEC_CRYPTO_N_ALG,
} ipsec_crypto_alg_t;
+#define IPSEC_CRYPTO_ALG_IS_GCM(_alg) \
+ (((_alg == IPSEC_CRYPTO_ALG_AES_GCM_128) || \
+ (_alg == IPSEC_CRYPTO_ALG_AES_GCM_192) || \
+ (_alg == IPSEC_CRYPTO_ALG_AES_GCM_256)))
+
#define foreach_ipsec_integ_alg \
_ (0, NONE, "none") \
_ (1, MD5_96, "md5-96") /* RFC2403 */ \
#define foreach_ipsec_integ_alg \
_ (0, NONE, "none") \
_ (1, MD5_96, "md5-96") /* RFC2403 */ \
@@
-92,6
+97,7
@@
typedef struct ipsec_key_t_
_ (16, UDP_ENCAP, "udp-encap") \
_ (32, IS_GRE, "GRE") \
_ (64, IS_INBOUND, "inboud") \
_ (16, UDP_ENCAP, "udp-encap") \
_ (32, IS_GRE, "GRE") \
_ (64, IS_INBOUND, "inboud") \
+ _ (128, IS_AEAD, "aead") \
typedef enum ipsec_sad_flags_t_
{
typedef enum ipsec_sad_flags_t_
{
@@
-111,7
+117,7
@@
typedef struct
u8 crypto_iv_size;
u8 crypto_block_size;
u8 crypto_iv_size;
u8 crypto_block_size;
- u8 integ_
trunc
_size;
+ u8 integ_
icv
_size;
u32 spi;
u32 seq;
u32 seq_hi;
u32 spi;
u32 seq;
u32 seq_hi;
@@
-119,9
+125,9
@@
typedef struct
u32 last_seq_hi;
u64 replay_window;
u32 last_seq_hi;
u64 replay_window;
- vnet_crypto_op_
type_t crypto_enc_op_type
;
- vnet_crypto_op_
type_t crypto_dec_op_type
;
- vnet_crypto_op_
type_t integ_op_type
;
+ vnet_crypto_op_
id_t crypto_enc_op_id
;
+ vnet_crypto_op_
id_t crypto_dec_op_id
;
+ vnet_crypto_op_
id_t integ_op_id
;
dpo_id_t dpo[IPSEC_N_PROTOCOLS];
dpo_id_t dpo[IPSEC_N_PROTOCOLS];
@@
-154,9
+160,9
@@
typedef struct
u32 sibling;
u32 tx_fib_index;
u32 sibling;
u32 tx_fib_index;
- u32 salt;
- /* runtime */
+ /* Salt used in GCM modes - stored in network byte order */
+ u32 salt;
} ipsec_sa_t;
STATIC_ASSERT_OFFSET_OF (ipsec_sa_t, cacheline1, CLIB_CACHE_LINE_BYTES);
} ipsec_sa_t;
STATIC_ASSERT_OFFSET_OF (ipsec_sa_t, cacheline1, CLIB_CACHE_LINE_BYTES);
@@
-192,6
+198,7
@@
extern int ipsec_sa_add (u32 id,
const ipsec_key_t * ik,
ipsec_sa_flags_t flags,
u32 tx_table_id,
const ipsec_key_t * ik,
ipsec_sa_flags_t flags,
u32 tx_table_id,
+ u32 salt,
const ip46_address_t * tunnel_src_addr,
const ip46_address_t * tunnel_dst_addr,
u32 * sa_index);
const ip46_address_t * tunnel_src_addr,
const ip46_address_t * tunnel_dst_addr,
u32 * sa_index);