wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 12:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

updated the formatting from the patch

Browse Source
This commit is contained in:
John Safranek
2013-05-21 17:39:11 -07:00
parent c325436712
commit 80225e58aa
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/internal.c
View File

@@ -1849,12 +1849,14 @@ int DtlsPoolSend(CYASSL* ssl)
word16 message_epoch; word16 message_epoch;
ato16(dtls->epoch, &message_epoch); ato16(dtls->epoch, &message_epoch);
if (message_epoch == ssl->keys.dtls_epoch) { if (message_epoch == ssl->keys.dtls_epoch) {
/* Increment record sequence number on retransmitted handshake messages */ /* Increment record sequence number on retransmitted handshake
c32to48(ssl->keys.dtls_sequence_number, dtls->sequence_number); * messages */
ssl->keys.dtls_sequence_number++; c32to48(ssl->keys.dtls_sequence_number, dtls->sequence_number);
ssl->keys.dtls_sequence_number++;
} }
else { else {
/* The Finished message is sent with the next epoch, keep its sequence number */ /* The Finished message is sent with the next epoch, keep its
* sequence number */
} }
if ((ret = CheckAvailableSize(ssl, buf->length)) != 0) if ((ret = CheckAvailableSize(ssl, buf->length)) != 0)
@@ -3356,9 +3358,9 @@ int DoFinished(CYASSL* ssl, const byte* input, word32* inOutIdx, int sniff)
ssl->options.handShakeState = HANDSHAKE_DONE; ssl->options.handShakeState = HANDSHAKE_DONE;
#ifdef CYASSL_DTLS #ifdef CYASSL_DTLS
if (ssl->options.dtls) { if (ssl->options.dtls) {
/* Other side has received our Finished, go to next epoch */ /* Other side has received our Finished, go to next epoch */
ssl->keys.dtls_epoch++; ssl->keys.dtls_epoch++;
ssl->keys.dtls_sequence_number = 1; ssl->keys.dtls_sequence_number = 1;
} }
#endif #endif
} }
@@ -3369,9 +3371,9 @@ int DoFinished(CYASSL* ssl, const byte* input, word32* inOutIdx, int sniff)
ssl->options.handShakeState = HANDSHAKE_DONE; ssl->options.handShakeState = HANDSHAKE_DONE;
#ifdef CYASSL_DTLS #ifdef CYASSL_DTLS
if (ssl->options.dtls) { if (ssl->options.dtls) {
/* Other side has received our Finished, go to next epoch */ /* Other side has received our Finished, go to next epoch */
ssl->keys.dtls_epoch++; ssl->keys.dtls_epoch++;
ssl->keys.dtls_sequence_number = 1; ssl->keys.dtls_sequence_number = 1;
} }
#endif #endif
} }
@@ -5053,8 +5055,8 @@ int SendFinished(CYASSL* ssl)
word32 sequence_number = ssl->keys.dtls_sequence_number; word32 sequence_number = ssl->keys.dtls_sequence_number;
word16 epoch = ssl->keys.dtls_epoch; word16 epoch = ssl->keys.dtls_epoch;
if (ssl->options.dtls) { if (ssl->options.dtls) {
/* Send Finished message with the next epoch, but don't commit that change /* Send Finished message with the next epoch, but don't commit that
* until the other end confirms its reception. */ * change until the other end confirms its reception. */
headerSz += DTLS_HANDSHAKE_EXTRA; headerSz += DTLS_HANDSHAKE_EXTRA;
ssl->keys.dtls_epoch++; ssl->keys.dtls_epoch++;
ssl->keys.dtls_sequence_number = 0; /* reset after epoch change */ ssl->keys.dtls_sequence_number = 0; /* reset after epoch change */
@@ -5095,7 +5097,8 @@ int SendFinished(CYASSL* ssl)
ssl->options.handShakeState = HANDSHAKE_DONE; ssl->options.handShakeState = HANDSHAKE_DONE;
#ifdef CYASSL_DTLS #ifdef CYASSL_DTLS
if (ssl->options.dtls) { if (ssl->options.dtls) {
/* Other side will soon receive our Finished, go to next epoch. */ /* Other side will soon receive our Finished, go to next
* epoch. */
ssl->keys.dtls_epoch++; ssl->keys.dtls_epoch++;
ssl->keys.dtls_sequence_number = 1; ssl->keys.dtls_sequence_number = 1;
} }
@@ -5107,7 +5110,8 @@ int SendFinished(CYASSL* ssl)
ssl->options.handShakeState = HANDSHAKE_DONE; ssl->options.handShakeState = HANDSHAKE_DONE;
#ifdef CYASSL_DTLS #ifdef CYASSL_DTLS
if (ssl->options.dtls) { if (ssl->options.dtls) {
/* Other side will soon receive our Finished, go to next epoch. */ /* Other side will soon receive our Finished, go to next
* epoch. */
ssl->keys.dtls_epoch++; ssl->keys.dtls_epoch++;
ssl->keys.dtls_sequence_number = 1; ssl->keys.dtls_sequence_number = 1;
} }