_(IKE_SA_INIT_IGNORE, "IKE_SA_INIT ignore (IKE SA already auth)") \
_(IKE_REQ_RETRANSMIT, "IKE request retransmit") \
_(IKE_REQ_IGNORE, "IKE request ignore (old msgid)") \
-_(NOT_IKEV2, "Non IKEv2 packets received")
+_(NOT_IKEV2, "Non IKEv2 packets received") \
+_(BAD_LENGTH, "Bad packet length")
typedef enum
{
if (prot_id == IKEV2_PROTOCOL_IKE)
{
mandatory_bitmap = (1 << IKEV2_TRANSFORM_TYPE_ENCR) |
- (1 << IKEV2_TRANSFORM_TYPE_PRF) |
- (1 << IKEV2_TRANSFORM_TYPE_INTEG) | (1 << IKEV2_TRANSFORM_TYPE_DH);
- optional_bitmap = mandatory_bitmap;
+ (1 << IKEV2_TRANSFORM_TYPE_PRF) | (1 << IKEV2_TRANSFORM_TYPE_DH);
+ optional_bitmap = mandatory_bitmap | (1 << IKEV2_TRANSFORM_TYPE_INTEG);
}
else if (prot_id == IKEV2_PROTOCOL_ESP)
{
/* calculate SKEYSEED = prf(Ni | Nr, g^ir) */
u8 *skeyseed = 0;
u8 *s = 0;
- u16 integ_key_len = 0;
+ u16 integ_key_len = 0, salt_len = 0;
ikev2_sa_transform_t *tr_encr, *tr_prf, *tr_integ;
tr_encr =
ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
if (tr_integ)
integ_key_len = tr_integ->key_len;
+ else
+ salt_len = sizeof (u32);
vec_append (s, sa->i_nonce);
vec_append (s, sa->r_nonce);
int len = tr_prf->key_trunc + /* SK_d */
integ_key_len * 2 + /* SK_ai, SK_ar */
tr_encr->key_len * 2 + /* SK_ei, SK_er */
- tr_prf->key_len * 2; /* SK_pi, SK_pr */
+ tr_prf->key_len * 2 + /* SK_pi, SK_pr */
+ salt_len * 2;
keymat = ikev2_calc_prfplus (tr_prf, skeyseed, s, len);
vec_free (skeyseed);
}
/* SK_ei */
- sa->sk_ei = vec_new (u8, tr_encr->key_len);
- clib_memcpy_fast (sa->sk_ei, keymat + pos, tr_encr->key_len);
- pos += tr_encr->key_len;
+ sa->sk_ei = vec_new (u8, tr_encr->key_len + salt_len);
+ clib_memcpy_fast (sa->sk_ei, keymat + pos, tr_encr->key_len + salt_len);
+ pos += tr_encr->key_len + salt_len;
/* SK_er */
- sa->sk_er = vec_new (u8, tr_encr->key_len);
- clib_memcpy_fast (sa->sk_er, keymat + pos, tr_encr->key_len);
- pos += tr_encr->key_len;
+ sa->sk_er = vec_new (u8, tr_encr->key_len + salt_len);
+ clib_memcpy_fast (sa->sk_er, keymat + pos, tr_encr->key_len + salt_len);
+ pos += tr_encr->key_len + salt_len;
/* SK_pi */
sa->sk_pi = vec_new (u8, tr_prf->key_len);
pos += tr_prf->key_len;
vec_free (keymat);
+ sa->keys_generated = 1;
}
static void
static void
ikev2_process_sa_init_req (vlib_main_t * vm, ikev2_sa_t * sa,
- ike_header_t * ike, udp_header_t * udp)
+ ike_header_t * ike, udp_header_t * udp, u32 len)
{
int p = 0;
- u32 len = clib_net_to_host_u32 (ike->length);
u8 payload = ike->nextpayload;
ikev2_elog_exchange ("ispi %lx rspi %lx IKE_INIT request received "
static void
ikev2_process_sa_init_resp (vlib_main_t * vm, ikev2_sa_t * sa,
- ike_header_t * ike, udp_header_t * udp)
+ ike_header_t * ike, udp_header_t * udp, u32 len)
{
int p = 0;
- u32 len = clib_net_to_host_u32 (ike->length);
u8 payload = ike->nextpayload;
sa->ispi = clib_net_to_host_u64 (ike->ispi);
}
static u8 *
-ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike, u8 * payload)
+ikev2_decrypt_sk_payload (ikev2_sa_t * sa, ike_header_t * ike, u8 * payload,
+ u32 len)
{
+ ikev2_main_per_thread_data_t *ptd = ikev2_get_per_thread_data ();
int p = 0;
- u8 last_payload = 0;
+ u8 last_payload = 0, *plaintext = 0;
u8 *hmac = 0;
- u32 len = clib_net_to_host_u32 (ike->length);
ike_payload_header_t *ikep = 0;
u32 plen = 0;
ikev2_sa_transform_t *tr_integ;
+ ikev2_sa_transform_t *tr_encr;
tr_integ =
ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_INTEG);
+ tr_encr =
+ ikev2_sa_get_td_for_type (sa->r_proposals, IKEV2_TRANSFORM_TYPE_ENCR);
+ int is_aead = tr_encr->encr_type == IKEV2_TRANSFORM_ENCR_TYPE_AES_GCM_16;
- if (!sa->sk_ar || !sa->sk_ai)
+ if ((!sa->sk_ar || !sa->sk_ai) && !is_aead)
return 0;
while (p < len &&
return 0;
}
- hmac =
- ikev2_calc_integr (tr_integ, sa->is_initiator ? sa->sk_ar : sa->sk_ai,
- (u8 *) ike, len - tr_integ->key_trunc);
+ if (is_aead)
+ {
+ if (plen < sizeof (*ikep) + IKEV2_GCM_ICV_SIZE)
+ return 0;
- plen = plen - sizeof (*ikep) - tr_integ->key_trunc;
+ plen -= sizeof (*ikep) + IKEV2_GCM_ICV_SIZE;
+ u8 *aad = (u8 *) ike;
+ u32 aad_len = ikep->payload - aad;
+ u8 *tag = ikep->payload + plen;
- if (memcmp (hmac, &ikep->payload[plen], tr_integ->key_trunc))
+ plaintext = ikev2_decrypt_aead_data (ptd, sa, tr_encr, ikep->payload,
+ plen, aad, aad_len, tag);
+ }
+ else
{
- ikev2_elog_error ("message integrity check failed");
+ if (len < tr_integ->key_trunc)
+ return 0;
+
+ hmac =
+ ikev2_calc_integr (tr_integ, sa->is_initiator ? sa->sk_ar : sa->sk_ai,
+ (u8 *) ike, len - tr_integ->key_trunc);
+
+ if (plen < sizeof (*ikep) + tr_integ->key_trunc)
+ return 0;
+
+ plen = plen - sizeof (*ikep) - tr_integ->key_trunc;
+
+ if (memcmp (hmac, &ikep->payload[plen], tr_integ->key_trunc))
+ {
+ ikev2_elog_error ("message integrity check failed");
+ vec_free (hmac);
+ return 0;
+ }
vec_free (hmac);
- return 0;
+
+ plaintext = ikev2_decrypt_data (ptd, sa, tr_encr, ikep->payload, plen);
}
- vec_free (hmac);
- return ikev2_decrypt_data (sa, ikep->payload, plen);
+ return plaintext;
}
static_always_inline int
}
static void
-ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike)
+ikev2_process_auth_req (vlib_main_t * vm, ikev2_sa_t * sa, ike_header_t * ike,
+ u32 len)
{
ikev2_child_sa_t *first_child_sa;
int p = 0;
ikev2_calc_keys (sa);
- plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
+ plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload, len);
if (!plaintext)
{
static void
ikev2_process_informational_req (vlib_main_t * vm, ikev2_sa_t * sa,
- ike_header_t * ike)
+ ike_header_t * ike, u32 len)
{
int p = 0;
u8 payload = ike->nextpayload;
"from %d.%d.%d.%d", clib_host_to_net_u64 (ike->ispi),
clib_host_to_net_u64 (ike->rspi), sa->iaddr.as_u32);
- plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
+ plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload, len);
if (!plaintext)
goto cleanup_and_exit;
static void
ikev2_process_create_child_sa_req (vlib_main_t * vm, ikev2_sa_t * sa,
- ike_header_t * ike)
+ ike_header_t * ike, u32 len)
{
int p = 0;
u8 payload = ike->nextpayload;
"from %d.%d.%d.%d", clib_host_to_net_u64 (ike->ispi),
clib_host_to_net_u64 (ike->rspi), sa->raddr.as_u32);
- plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload);
+ plaintext = ikev2_decrypt_sk_payload (sa, ike, &payload, len);
if (!plaintext)
goto cleanup_and_exit;
{
ip46_address_set_ip4 (&a.local_ip, &sa->iaddr);
ip46_address_set_ip4 (&a.remote_ip, &sa->raddr);
- proposals = child->i_proposals;
+ proposals = child->r_proposals;
a.local_spi = child->r_proposals[0].spi;
a.remote_spi = child->i_proposals[0].spi;
}
{
ip46_address_set_ip4 (&a.local_ip, &sa->raddr);
ip46_address_set_ip4 (&a.remote_ip, &sa->iaddr);
- proposals = child->r_proposals;
+ proposals = child->i_proposals;
a.local_spi = child->i_proposals[0].spi;
a.remote_spi = child->r_proposals[0].spi;
}
}
else
{
-
+ ikev2_main_per_thread_data_t *ptd = ikev2_get_per_thread_data ();
ikev2_payload_chain_add_padding (chain, tr_encr->block_size);
/* SK payload */
ph = (ike_payload_header_t *) & ike->payload[0];
ph->nextpayload = chain->first_payload_type;
ph->flags = 0;
- int enc_len = ikev2_encrypt_data (sa, chain->data, ph->payload);
- plen += enc_len;
-
- /* add space for hmac */
- plen += tr_integ->key_trunc;
+ int is_aead =
+ tr_encr->encr_type == IKEV2_TRANSFORM_ENCR_TYPE_AES_GCM_16;
+ int iv_len = is_aead ? IKEV2_GCM_IV_SIZE : tr_encr->block_size;
+ plen += vec_len (chain->data) + iv_len;
+
+ /* add space for hmac/tag */
+ if (tr_integ)
+ plen += tr_integ->key_trunc;
+ else
+ plen += IKEV2_GCM_ICV_SIZE;
tlen += plen;
/* payload and total length */
ph->length = clib_host_to_net_u16 (plen);
ike->length = clib_host_to_net_u32 (tlen);
- /* calc integrity data for whole packet except hash itself */
- integ =
- ikev2_calc_integr (tr_integ, sa->is_initiator ? sa->sk_ai : sa->sk_ar,
- (u8 *) ike, tlen - tr_integ->key_trunc);
-
- clib_memcpy_fast (ike->payload + tlen - tr_integ->key_trunc -
- sizeof (*ike), integ, tr_integ->key_trunc);
+ if (is_aead)
+ {
+ ikev2_encrypt_aead_data (ptd, sa, tr_encr, chain->data,
+ ph->payload, (u8 *) ike,
+ sizeof (*ike) + sizeof (*ph),
+ ph->payload + plen - sizeof (*ph) -
+ IKEV2_GCM_ICV_SIZE);
+ }
+ else
+ {
+ ikev2_encrypt_data (ptd, sa, tr_encr, chain->data, ph->payload);
+ integ =
+ ikev2_calc_integr (tr_integ,
+ sa->is_initiator ? sa->sk_ai : sa->sk_ar,
+ (u8 *) ike, tlen - tr_integ->key_trunc);
+ clib_memcpy_fast (ike->payload + tlen - tr_integ->key_trunc -
+ sizeof (*ike), integ, tr_integ->key_trunc);
+ }
/* store whole IKE payload - needed for retransmit */
vec_free (sa->last_res_packet_data);
return tlen;
}
-static int
+static u32
ikev2_retransmit_sa_init (ike_header_t * ike,
- ip4_address_t iaddr, ip4_address_t raddr)
+ ip4_address_t iaddr, ip4_address_t raddr, u32 rlen)
{
ikev2_main_t *km = &ikev2_main;
ikev2_sa_t *sa;
sa->raddr.as_u32 == raddr.as_u32)
{
int p = 0;
- u32 len = clib_net_to_host_u32(ike->length);
u8 payload = ike->nextpayload;
- while (p < len && payload!= IKEV2_PAYLOAD_NONE) {
+ while (p < rlen && payload!= IKEV2_PAYLOAD_NONE) {
ike_payload_header_t * ikep = (ike_payload_header_t *) &ike->payload[p];
u32 plen = clib_net_to_host_u16(ikep->length);
/* req is retransmit */
if (sa->state == IKEV2_STATE_SA_INIT)
{
- ike_header_t * tmp;
- tmp = (ike_header_t*)sa->last_sa_init_res_packet_data;
+ ike_header_t * tmp = (ike_header_t*)sa->last_sa_init_res_packet_data;
+ u32 slen = clib_net_to_host_u32(tmp->length);
ike->ispi = tmp->ispi;
ike->rspi = tmp->rspi;
ike->nextpayload = tmp->nextpayload;
ike->flags = tmp->flags;
ike->msgid = tmp->msgid;
ike->length = tmp->length;
- clib_memcpy_fast(ike->payload, tmp->payload,
- clib_net_to_host_u32(tmp->length) - sizeof(*ike));
+ clib_memcpy_fast(ike->payload, tmp->payload, slen - sizeof(*ike));
ikev2_elog_uint_peers (IKEV2_LOG_DEBUG,
"ispi %lx IKE_SA_INIT retransmit "
"from %d.%d.%d.%d to %d.%d.%d.%d",
ike->ispi,
raddr.as_u32, iaddr.as_u32);
- return 1;
+ return slen;
}
/* else ignore req */
else
"from %d.%d.%d.%d to %d.%d.%d.%d",
ike->ispi,
raddr.as_u32, iaddr.as_u32);
- return -1;
+ return ~0;
}
}
}
return 0;
}
-static int
-ikev2_retransmit_resp (ikev2_sa_t * sa, ike_header_t * ike)
+static u32
+ikev2_retransmit_resp (ikev2_sa_t * sa, ike_header_t * ike, u32 rlen)
{
u32 msg_id = clib_net_to_host_u32 (ike->msgid);
sa->last_msg_id = msg_id;
return 0;
}
+
/* retransmitted req */
- else if (msg_id == sa->last_msg_id)
+ if (msg_id == sa->last_msg_id)
{
- ike_header_t *tmp;
- tmp = (ike_header_t *) sa->last_res_packet_data;
+ ike_header_t *tmp = (ike_header_t *) sa->last_res_packet_data;
+ u32 slen = clib_net_to_host_u32 (tmp->length);
ike->ispi = tmp->ispi;
ike->rspi = tmp->rspi;
ike->nextpayload = tmp->nextpayload;
ike->flags = tmp->flags;
ike->msgid = tmp->msgid;
ike->length = tmp->length;
- clib_memcpy_fast (ike->payload, tmp->payload,
- clib_net_to_host_u32 (tmp->length) - sizeof (*ike));
+ clib_memcpy_fast (ike->payload, tmp->payload, slen - sizeof (*ike));
ikev2_elog_uint_peers (IKEV2_LOG_DEBUG, "IKE retransmit msgid %d",
msg_id, sa->raddr.as_u32, sa->iaddr.as_u32);
- return 1;
+ return slen;
}
+
/* old req ignore */
- else
- {
- ikev2_elog_uint_peers (IKEV2_LOG_DEBUG, "IKE req ignore msgid %d",
- msg_id, sa->raddr.as_u32, sa->iaddr.as_u32);
- }
- return -1;
+ ikev2_elog_uint_peers (IKEV2_LOG_DEBUG, "IKE req ignore msgid %d",
+ msg_id, sa->raddr.as_u32, sa->iaddr.as_u32);
+ return ~0;
}
static void
ike_header_t *ike0;
ikev2_sa_t *sa0 = 0;
ikev2_sa_t sa; /* temporary store for SA */
- int len = 0;
- int r, is_req = 0, has_non_esp_marker = 0;
+ u32 rlen, slen = 0;
+ int is_req = 0, has_non_esp_marker = 0;
/* speculatively enqueue b0 to the current next frame */
bi0 = from[0];
ip40 = vlib_buffer_get_current (b0);
}
+ rlen = b0->current_length - sizeof (*ip40) - sizeof (*udp0);
+
/* check for non-esp marker */
if (*((u32 *) ike0) == 0)
{
- ike0 = (ike_header_t *) ((u8 *) ike0 + sizeof (u32));
+ ike0 =
+ (ike_header_t *) ((u8 *) ike0 +
+ sizeof (ikev2_non_esp_marker));
+ rlen -= sizeof (ikev2_non_esp_marker);
has_non_esp_marker = 1;
}
+ if (clib_net_to_host_u32 (ike0->length) != rlen)
+ {
+ vlib_node_increment_counter (vm, ikev2_node.index,
+ IKEV2_ERROR_BAD_LENGTH, 1);
+ goto dispatch0;
+ }
+
if (ike0->version != IKE_VERSION_2)
{
vlib_node_increment_counter (vm, ikev2_node.index,
sa0->iaddr.as_u32 = ip40->src_address.as_u32;
sa0->dst_port = clib_net_to_host_u16 (udp0->src_port);
- r = ikev2_retransmit_sa_init (ike0, sa0->iaddr,
- sa0->raddr);
- if (r == 1)
+ slen =
+ ikev2_retransmit_sa_init (ike0, sa0->iaddr,
+ sa0->raddr, rlen);
+ if (slen)
{
vlib_node_increment_counter (vm, ikev2_node.index,
+ ~0 ==
+ slen ?
+ IKEV2_ERROR_IKE_SA_INIT_IGNORE
+ :
IKEV2_ERROR_IKE_SA_INIT_RETRANSMIT,
1);
- len = clib_net_to_host_u32 (ike0->length);
- goto dispatch0;
- }
- else if (r == -1)
- {
- vlib_node_increment_counter (vm, ikev2_node.index,
- IKEV2_ERROR_IKE_SA_INIT_IGNORE,
- 1);
goto dispatch0;
}
- ikev2_process_sa_init_req (vm, sa0, ike0, udp0);
+ ikev2_process_sa_init_req (vm, sa0, ike0, udp0, rlen);
if (sa0->state == IKEV2_STATE_SA_INIT)
{
if (sa0->state == IKEV2_STATE_SA_INIT
|| sa0->state == IKEV2_STATE_NOTIFY_AND_DELETE)
{
- len = ikev2_generate_message (sa0, ike0, 0, udp0);
+ slen = ikev2_generate_message (sa0, ike0, 0, udp0);
}
if (sa0->state == IKEV2_STATE_SA_INIT)
{
sa0->raddr.as_u32 = ip40->src_address.as_u32;
sa0->iaddr.as_u32 = ip40->dst_address.as_u32;
- ikev2_process_sa_init_resp (vm, sa0, ike0, udp0);
+ ikev2_process_sa_init_resp (vm, sa0, ike0, udp0, rlen);
if (sa0->state == IKEV2_STATE_SA_INIT)
{
ikev2_complete_sa_data (sa0, sai);
ikev2_calc_keys (sa0);
ikev2_sa_auth_init (sa0);
- len =
+ slen =
ikev2_generate_message (sa0, ike0, 0, udp0);
}
else
pool_elt_at_index (km->per_thread_data[thread_index].sas,
p[0]);
- r = ikev2_retransmit_resp (sa0, ike0);
- if (r == 1)
+ slen = ikev2_retransmit_resp (sa0, ike0, rlen);
+ if (slen)
{
vlib_node_increment_counter (vm, ikev2_node.index,
+ ~0 ==
+ slen ?
+ IKEV2_ERROR_IKE_REQ_IGNORE
+ :
IKEV2_ERROR_IKE_REQ_RETRANSMIT,
1);
- len = clib_net_to_host_u32 (ike0->length);
- goto dispatch0;
- }
- else if (r == -1)
- {
- vlib_node_increment_counter (vm, ikev2_node.index,
- IKEV2_ERROR_IKE_REQ_IGNORE,
- 1);
goto dispatch0;
}
sa0->dst_port = clib_net_to_host_u16 (udp0->src_port);
- ikev2_process_auth_req (vm, sa0, ike0);
+ ikev2_process_auth_req (vm, sa0, ike0, rlen);
ikev2_sa_auth (sa0);
if (sa0->state == IKEV2_STATE_AUTHENTICATED)
{
}
else
{
- len = ikev2_generate_message (sa0, ike0, 0, udp0);
+ slen = ikev2_generate_message (sa0, ike0, 0, udp0);
}
}
}
pool_elt_at_index (km->per_thread_data[thread_index].sas,
p[0]);
- r = ikev2_retransmit_resp (sa0, ike0);
- if (r == 1)
+ slen = ikev2_retransmit_resp (sa0, ike0, rlen);
+ if (slen)
{
vlib_node_increment_counter (vm, ikev2_node.index,
+ ~0 ==
+ slen ?
+ IKEV2_ERROR_IKE_REQ_IGNORE
+ :
IKEV2_ERROR_IKE_REQ_RETRANSMIT,
1);
- len = clib_net_to_host_u32 (ike0->length);
- goto dispatch0;
- }
- else if (r == -1)
- {
- vlib_node_increment_counter (vm, ikev2_node.index,
- IKEV2_ERROR_IKE_REQ_IGNORE,
- 1);
goto dispatch0;
}
- ikev2_process_informational_req (vm, sa0, ike0);
+ ikev2_process_informational_req (vm, sa0, ike0, rlen);
if (sa0->del)
{
if (sa0->del[0].protocol_id != IKEV2_PROTOCOL_IKE)
if (!(ike0->flags & IKEV2_HDR_FLAG_RESPONSE))
{
ike0->flags |= IKEV2_HDR_FLAG_RESPONSE;
- len = ikev2_generate_message (sa0, ike0, 0, udp0);
+ slen = ikev2_generate_message (sa0, ike0, 0, udp0);
}
}
}
pool_elt_at_index (km->per_thread_data[thread_index].sas,
p[0]);
- r = ikev2_retransmit_resp (sa0, ike0);
- if (r == 1)
+ slen = ikev2_retransmit_resp (sa0, ike0, rlen);
+ if (slen)
{
vlib_node_increment_counter (vm, ikev2_node.index,
+ ~0 ==
+ slen ?
+ IKEV2_ERROR_IKE_REQ_IGNORE
+ :
IKEV2_ERROR_IKE_REQ_RETRANSMIT,
1);
- len = clib_net_to_host_u32 (ike0->length);
- goto dispatch0;
- }
- else if (r == -1)
- {
- vlib_node_increment_counter (vm, ikev2_node.index,
- IKEV2_ERROR_IKE_REQ_IGNORE,
- 1);
goto dispatch0;
}
- ikev2_process_create_child_sa_req (vm, sa0, ike0);
+ ikev2_process_create_child_sa_req (vm, sa0, ike0, rlen);
if (sa0->rekey)
{
if (sa0->rekey[0].protocol_id != IKEV2_PROTOCOL_IKE)
}
else
{
- len = ikev2_generate_message (sa0, ike0, 0, udp0);
+ slen = ikev2_generate_message (sa0, ike0, 0, udp0);
}
}
}
dispatch0:
/* if we are sending packet back, rewrite headers */
- if (len)
+ if (slen && ~0 != slen)
{
next0 = IKEV2_NEXT_IP4_LOOKUP;
if (sa0->is_initiator)
&& sa0->natt)
{
if (!has_non_esp_marker)
- len = ikev2_insert_non_esp_marker (ike0, len);
+ slen = ikev2_insert_non_esp_marker (ike0, slen);
}
}
else
{
if (has_non_esp_marker)
- len += sizeof (ikev2_non_esp_marker);
+ slen += sizeof (ikev2_non_esp_marker);
u16 tp = udp0->dst_port;
udp0->dst_port = udp0->src_port;
}
udp0->length =
- clib_host_to_net_u16 (len + sizeof (udp_header_t));
+ clib_host_to_net_u16 (slen + sizeof (udp_header_t));
udp0->checksum = 0;
b0->current_length =
- len + sizeof (ip4_header_t) + sizeof (udp_header_t);
+ slen + sizeof (ip4_header_t) + sizeof (udp_header_t);
ip40->length = clib_host_to_net_u16 (b0->current_length);
ip40->checksum = ip4_header_checksum (ip40);
}
return r;
}
- if (is_ike || IKEV2_TRANSFORM_ENCR_TYPE_AES_GCM_16 != ts->crypto_alg)
+ if (IKEV2_TRANSFORM_INTEG_TYPE_NONE != ts->integ_alg)
{
/* Integrity */
error = 1;
ikev2_set_profile_esp_transforms (vlib_main_t * vm, u8 * name,
ikev2_transform_encr_type_t crypto_alg,
ikev2_transform_integ_type_t integ_alg,
- ikev2_transform_dh_type_t dh_type,
u32 crypto_key_size)
{
ikev2_profile_t *p;
p->esp_ts.crypto_alg = crypto_alg;
p->esp_ts.integ_alg = integ_alg;
- p->esp_ts.dh_type = dh_type;
p->esp_ts.crypto_key_size = crypto_key_size;
return 0;
}
vec_validate_aligned (km->per_thread_data, tm->n_vlib_mains - 1,
CLIB_CACHE_LINE_BYTES);
- for (thread_id = 0; thread_id < tm->n_vlib_mains - 1; thread_id++)
+ for (thread_id = 0; thread_id < tm->n_vlib_mains; thread_id++)
{
- km->per_thread_data[thread_id].sa_by_rspi =
- hash_create (0, sizeof (uword));
+ ikev2_main_per_thread_data_t *ptd =
+ vec_elt_at_index (km->per_thread_data, thread_id);
+
+ ptd->sa_by_rspi = hash_create (0, sizeof (uword));
+
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ ptd->evp_ctx = EVP_CIPHER_CTX_new ();
+ ptd->hmac_ctx = HMAC_CTX_new ();
+#else
+ EVP_CIPHER_CTX_init (&ptd->_evp_ctx);
+ ptd->evp_ctx = &ptd->_evp_ctx;
+ HMAC_CTX_init (&(ptd->_hmac_ctx));
+ ptd->hmac_ctx = &ptd->_hmac_ctx;
+#endif
}
km->sa_by_ispi = hash_create (0, sizeof (uword));
csa->time_to_expiration = 0;
ikev2_delete_child_sa_internal (vm, sa, csa);
res |= 1;
+ return res;
}
}
u32 *sas_in = NULL;
vec_add1 (sas_in, csa->remote_sa_id);
+ vlib_worker_thread_barrier_sync (vm);
ipsec_tun_protect_update (sw_if_index, NULL, csa->local_sa_id, sas_in);
ipsec_sa_unlock_id (ikev2_flip_alternate_sa_bit (csa->remote_sa_id));
+ vlib_worker_thread_barrier_release (vm);
}
return res;
ikev2_main_t *km = &ikev2_main;
vlib_main_t *vm = km->vlib_main;
- if (!sa->sk_ai || !sa->sk_ar)
+ if (!sa->keys_generated)
return 0;
if (sa->liveness_retries >= km->liveness_max_retries)
Code Review / vpp.git / blobdiff