feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #588 from steweg/fix_dtls_retranmission

Browse Source 
Adjust DTLS retranmission logic
This commit is contained in:
John Safranek
2016-11-01 09:29:30 -07:00
committed by GitHub
parent 79cba75925 59fdd98f1d
commit 3065bb2178
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/internal.c
View File

@@ -4118,8 +4118,23 @@ int DtlsPoolTimeout(WOLFSSL* ssl)
return result; return result;
} }
int VerifyForDtlsPoolSend(WOLFSSL* ssl, byte type, word32 fragOffset)
{
/**
* only the first message from previous flight should be valid
* to be used for triggering retransmission of whole DtlsPool.
* change cipher suite type is not verified here
*/
return ((fragOffset == 0) &&
(((ssl->options.side == WOLFSSL_SERVER_END) &&
((type == client_hello) ||
((ssl->options.verifyPeer) && (type == certificate)) ||
((!ssl->options.verifyPeer) && (type == client_key_exchange)))) ||
((ssl->options.side == WOLFSSL_CLIENT_END) &&
(type == server_hello))));
}
int DtlsPoolSend(WOLFSSL* ssl) int DtlsPoolSend(WOLFSSL* ssl, byte sendOnlyFirstPacket)
{ {
DtlsPool* pool = ssl->dtls_pool; DtlsPool* pool = ssl->dtls_pool;
@@ -4127,8 +4142,19 @@ int DtlsPoolSend(WOLFSSL* ssl)
int ret = 0; int ret = 0;
int i; int i;
buffer* buf; buffer* buf;
/**
* on server side, retranmission is being triggered only by sending
* first message of given flight, in order to trigger client
* to retransmit its whole flight. Sending the whole previous flight
* could lead to retranmission of previous client flight for each
* server message from previous flight. Therefore one message should be
* enough to do the trick.
*/
int maxPoolIndex = (((sendOnlyFirstPacket == 1) &&
(ssl->options.side == WOLFSSL_SERVER_END) &&
(pool->used >= 1)) ? 1 : pool->used);
for (i = 0, buf = pool->buf; i < pool->used; i++, buf++) { for (i = 0, buf = pool->buf; i < maxPoolIndex; i++, buf++) {
if (pool->epoch[i] == 0) { if (pool->epoch[i] == 0) {
DtlsRecordLayerHeader* dtls; DtlsRecordLayerHeader* dtls;
int epochOrder; int epochOrder;
@@ -4938,7 +4964,7 @@ retry:
if (IsDtlsNotSctpMode(ssl) && if (IsDtlsNotSctpMode(ssl) &&
!ssl->options.handShakeDone && !ssl->options.handShakeDone &&
DtlsPoolTimeout(ssl) == 0 && DtlsPoolTimeout(ssl) == 0 &&
DtlsPoolSend(ssl) == 0) { DtlsPoolSend(ssl, 0) == 0) {
goto retry; goto retry;
} }
@@ -7995,8 +8021,8 @@ static int DoDtlsHandShakeMsg(WOLFSSL* ssl, byte* input, word32* inOutIdx,
} }
*inOutIdx += ssl->keys.padSz; *inOutIdx += ssl->keys.padSz;
} }
if (IsDtlsNotSctpMode(ssl)) if (IsDtlsNotSctpMode(ssl) && VerifyForDtlsPoolSend(ssl, type, fragOffset))
ret = DtlsPoolSend(ssl); ret = DtlsPoolSend(ssl, 0);
} }
else if (fragSz < size) { else if (fragSz < size) {
/* Since this branch is in order, but fragmented, dtls_msg_list will be /* Since this branch is in order, but fragmented, dtls_msg_list will be
@@ -9356,7 +9382,7 @@ int ProcessReply(WOLFSSL* ssl)
ssl->buffers.inputBuffer.idx = 0; ssl->buffers.inputBuffer.idx = 0;
if (IsDtlsNotSctpMode(ssl) && ssl->options.dtlsHsRetain) { if (IsDtlsNotSctpMode(ssl) && ssl->options.dtlsHsRetain) {
ret = DtlsPoolSend(ssl); ret = DtlsPoolSend(ssl, 0);
if (ret != 0) if (ret != 0)
return ret; return ret;
} }
@@ -9515,7 +9541,7 @@ int ProcessReply(WOLFSSL* ssl)
return ret; return ret;
if (IsDtlsNotSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
ret = DtlsPoolSend(ssl); ret = DtlsPoolSend(ssl, 1);
if (ret != 0) if (ret != 0)
return ret; return ret;
} }

2
src/ssl.c
View File

@@ -6750,7 +6750,7 @@ int wolfSSL_dtls_got_timeout(WOLFSSL* ssl)
int result = SSL_SUCCESS; int result = SSL_SUCCESS;
if (!ssl->options.handShakeDone && if (!ssl->options.handShakeDone &&
(DtlsPoolTimeout(ssl) < 0 || DtlsPoolSend(ssl) < 0)) { (DtlsPoolTimeout(ssl) < 0 || DtlsPoolSend(ssl, 0) < 0)) {
result = SSL_FATAL_ERROR; result = SSL_FATAL_ERROR;
} }

3
wolfssl/internal.h
View File

@@ -3073,7 +3073,8 @@ WOLFSSL_LOCAL int GrowInputBuffer(WOLFSSL* ssl, int size, int usedLength);
WOLFSSL_LOCAL int DtlsPoolInit(WOLFSSL*); WOLFSSL_LOCAL int DtlsPoolInit(WOLFSSL*);
WOLFSSL_LOCAL int DtlsPoolSave(WOLFSSL*, const byte*, int); WOLFSSL_LOCAL int DtlsPoolSave(WOLFSSL*, const byte*, int);
WOLFSSL_LOCAL int DtlsPoolTimeout(WOLFSSL*); WOLFSSL_LOCAL int DtlsPoolTimeout(WOLFSSL*);
WOLFSSL_LOCAL int DtlsPoolSend(WOLFSSL*); WOLFSSL_LOCAL int DtlsPoolSend(WOLFSSL*, byte);
WOLFSSL_LOCAL int VerifyForDtlsPoolSend(WOLFSSL*, byte, word32);
WOLFSSL_LOCAL void DtlsPoolReset(WOLFSSL*); WOLFSSL_LOCAL void DtlsPoolReset(WOLFSSL*);
WOLFSSL_LOCAL void DtlsPoolDelete(WOLFSSL*); WOLFSSL_LOCAL void DtlsPoolDelete(WOLFSSL*);