diff options
| author |   Benoît Ganne <bganne@cisco.com> | 2022-01-18 15:56:41 +0100 |
|---|---|---|
| committer | Benoît Ganne <bganne@cisco.com> | 2023-02-07 14:34:27 +0100 |
| commit | 3c1021a679193475cbee59a717a53ece009e273f (patch) | |
| tree | 880c7ea4d46f3237998f62730d4814981c74754f /src/vnet/crypto/crypto.h | |
| parent | f53edbc3b4e35b368361e0c61b1adf0d5ab70bf7 (diff) | |
ipsec: fix AES CBC IV generation (CVE-2022-46397)stable/2005
For AES-CBC, the IV must be unpredictable (see NIST SP800-38a Appendix
C). Chaining IVs like is done by ipsecmb and native backends for the
VNET_CRYPTO_OP_FLAG_INIT_IV is fully predictable.
Encrypt a counter as part of the message, making the (predictable)
counter-generated IV unpredictable.
Fixes: VPP-2037
Type: fix
Change-Id: If4f192d62bf97dda553e7573331c75efa11822ae
Signed-off-by: Benoît Ganne <bganne@cisco.com>
Diffstat (limited to 'src/vnet/crypto/crypto.h')
| -rw-r--r-- | src/vnet/crypto/crypto.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vnet/crypto/crypto.h b/src/vnet/crypto/crypto.h index b0a83e08be3..1bb6a04c0ee 100644 --- a/src/vnet/crypto/crypto.h +++ b/src/vnet/crypto/crypto.h @@ -304,7 +304,7 @@ typedef struct i16 integ_start_offset; u32 crypto_total_length; /* adj total_length for integ, e.g.4 bytes for IPSec ESN */ - u16 integ_length_adj; + i16 integ_length_adj; u8 *iv; union { @@ -573,7 +573,7 @@ vnet_crypto_async_add_to_frame (vlib_main_t * vm, u32 key_index, u32 crypto_len, i16 integ_len_adj, i16 crypto_start_offset, - u16 integ_start_offset, + i16 integ_start_offset, u32 buffer_index, u16 next_node, u8 * iv, u8 * tag, u8 * aad, u8 flags) |