eclipse/tinydtls
1
0
Fork 0
mirror of https://github.com/eclipse/tinydtls.git synced 2025-05-08 11:27:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix processing received records of wrong epoch.

Browse Source 
Introduce a read_epoch to be used during the handshake.
Increment that, when the ccs is handled.
Drop received none matching records.

Signed-off-by: Achim Kraus <achim.kraus@bosch.io>
This commit is contained in:
Achim Kraus 2021-06-26 17:40:38 +02:00
parent 621d8a52d0
commit 181330b4ab
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dtls.c
View File

@ -2868,6 +2868,7 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
p += sizeof(uint16);
handshake->extended_master_secret = 1;
handshake->hs_state.read_epoch = dtls_security_params(peer)->epoch;
assert((buf <= p) && ((unsigned int)(p - buf) <= sizeof(buf)));
clear_hs_hash(peer);
@ -3326,7 +3327,7 @@ decrypt_verify(dtls_peer_t *peer, uint8 *packet, size_t length,
uint8 **cleartext)
{
dtls_record_header_t *header = DTLS_RECORD_HEADER(packet);
dtls_security_parameters_t *security = dtls_security_params_epoch(peer, dtls_get_epoch(header));
dtls_security_parameters_t *security = dtls_security_params_read_epoch(peer, dtls_get_epoch(header));
int clen;
*cleartext = (uint8 *)packet + sizeof(dtls_record_header_t);
@ -3726,6 +3727,7 @@ handle_handshake_msg(dtls_context_t *ctx, dtls_peer_t *peer, uint8 *data, size_t
peer->handshake_params->hs_state.mseq_r = dtls_uint16_to_int(hs_header->message_seq);
peer->handshake_params->hs_state.mseq_s = 1;
peer->handshake_params->hs_state.read_epoch = dtls_security_params(peer)->epoch;
}
err = handle_verified_client_hello(ctx, peer, data, data_length);
@ -3866,6 +3868,7 @@ handle_0_client_hello(dtls_context_t *ctx, dtls_ephemeral_peer_t *ephemeral_peer
return dtls_alert_fatal_create(DTLS_ALERT_INTERNAL_ERROR);
}
peer->handshake_params->hs_state.read_epoch = dtls_security_params(peer)->epoch;
peer->handshake_params->hs_state.mseq_r = ephemeral_peer->mseq;
peer->handshake_params->hs_state.mseq_s = ephemeral_peer->mseq;
@ -4030,6 +4033,8 @@ handle_ccs(dtls_context_t *ctx, dtls_peer_t *peer,
}
}
peer->handshake_params->hs_state.read_epoch++;
assert(peer->handshake_params->hs_state.read_epoch > 0);
peer->state = DTLS_STATE_WAIT_FINISHED;
return 0;

19
peer.h
View File

@ -76,6 +76,25 @@ static inline dtls_security_parameters_t *dtls_security_params_epoch(dtls_peer_t
}
}
/**
* Get security parameter for read epoch.
*
* @param peer The remote party where the packet is received from.
* @param epoch The read epoch the packet is received in.
* @return The security parameter for the remote party and read epoch. @c NULL if not available.
*/
static inline dtls_security_parameters_t *dtls_security_params_read_epoch(dtls_peer_t *peer, uint16_t epoch)
{
if (peer->handshake_params) {
if (peer->handshake_params->hs_state.read_epoch == epoch) {
return dtls_security_params_epoch(peer, epoch);
}
} else if (peer->security_params[0] && peer->security_params[0]->epoch == epoch) {
return peer->security_params[0];
}
return NULL;
}
static inline dtls_security_parameters_t *dtls_security_params(dtls_peer_t *peer)
{
return peer->security_params[0];

2
state.h
View File

@ -47,6 +47,8 @@ typedef struct {
uint16_t mseq_s; /**< send handshake message sequence number counter */
uint16_t mseq_r; /**< received handshake message sequence number counter */
uint16_t read_epoch; /**< handshake's current read epoch */
/** pending config that is updated during handshake */
/* FIXME: dtls_security_parameters_t pending_config; */