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

Fix polarity on the DTLS-SCTP check.

Browse Source
This commit is contained in:
John Safranek
2016-08-23 08:53:38 -07:00
parent 7b3255b5bb
commit f3dca48e99
1 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/internal.c
View File

@ -197,14 +197,14 @@ static INLINE int IsEncryptionOn(WOLFSSL* ssl, int isSend)
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
/* If SCTP is not enabled returns the state of the dtls option. /* If SCTP is not enabled returns the state of the dtls option.
* If SCTP is enabled returns dtls && sctp. */ * If SCTP is enabled returns dtls && !sctp. */
static INLINE int IsDtlsSctpMode(WOLFSSL* ssl) static INLINE int IsDtlsNotSctpMode(WOLFSSL* ssl)
{ {
int result = ssl->options.dtls; int result = ssl->options.dtls;
if (result) { if (result) {
#ifdef WOLFSSL_SCTP #ifdef WOLFSSL_SCTP
result = ssl->options.dtlsSctp; result = !ssl->options.dtlsSctp;
#endif #endif
} }
@ -4801,17 +4801,15 @@ retry:
return -1; return -1;
case WOLFSSL_CBIO_ERR_TIMEOUT: case WOLFSSL_CBIO_ERR_TIMEOUT:
if (ssl->options.dtls) { #ifdef WOLFSSL_DTLS
#ifdef WOLFSSL_DTLS if (IsDtlsNotSctpMode(ssl) &&
if (!ssl->options.handShakeDone && !ssl->options.handShakeDone &&
IsDtlsSctpMode(ssl) && DtlsPoolTimeout(ssl) == 0 &&
DtlsPoolTimeout(ssl) == 0 && DtlsPoolSend(ssl) == 0) {
DtlsPoolSend(ssl) == 0) {
goto retry; goto retry;
}
#endif
} }
#endif
return -1; return -1;
default: default:
@ -5078,7 +5076,7 @@ static int GetRecordHeader(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
} }
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl) && if (IsDtlsNotSctpMode(ssl) &&
(!DtlsCheckWindow(&ssl->keys.dtls_state) || (!DtlsCheckWindow(&ssl->keys.dtls_state) ||
(ssl->options.handShakeDone && ssl->keys.dtls_state.curEpoch == 0))) { (ssl->options.handShakeDone && ssl->keys.dtls_state.curEpoch == 0))) {
return SEQUENCE_ERROR; return SEQUENCE_ERROR;
@ -7813,7 +7811,7 @@ static int DoDtlsHandShakeMsg(WOLFSSL* ssl, byte* input, word32* inOutIdx,
} }
*inOutIdx += ssl->keys.padSz; *inOutIdx += ssl->keys.padSz;
} }
if (IsDtlsSctpMode(ssl)) if (IsDtlsNotSctpMode(ssl))
ret = DtlsPoolSend(ssl); ret = DtlsPoolSend(ssl);
} }
else if (fragSz < size) { else if (fragSz < size) {
@ -9204,7 +9202,7 @@ int ProcessReply(WOLFSSL* ssl)
ssl->buffers.inputBuffer.length = 0; ssl->buffers.inputBuffer.length = 0;
ssl->buffers.inputBuffer.idx = 0; ssl->buffers.inputBuffer.idx = 0;
if (ssl->options.dtlsHsRetain && IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl) && ssl->options.dtlsHsRetain) {
ret = DtlsPoolSend(ssl); ret = DtlsPoolSend(ssl);
if (ret != 0) if (ret != 0)
return ret; return ret;
@ -9307,7 +9305,7 @@ int ProcessReply(WOLFSSL* ssl)
} }
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
DtlsUpdateWindow(&ssl->keys.dtls_state); DtlsUpdateWindow(&ssl->keys.dtls_state);
} }
#endif /* WOLFSSL_DTLS */ #endif /* WOLFSSL_DTLS */
@ -9363,7 +9361,7 @@ int ProcessReply(WOLFSSL* ssl)
if (ret != DUPLICATE_MSG_E && ret != OUT_OF_ORDER_E) if (ret != DUPLICATE_MSG_E && ret != OUT_OF_ORDER_E)
return ret; return ret;
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
ret = DtlsPoolSend(ssl); ret = DtlsPoolSend(ssl);
if (ret != 0) if (ret != 0)
return ret; return ret;
@ -9558,7 +9556,7 @@ int SendChangeCipher(WOLFSSL* ssl)
} }
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0) if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0)
return ret; return ret;
} }
@ -9997,7 +9995,7 @@ int SendFinished(WOLFSSL* ssl)
#endif #endif
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
if ((ret = DtlsPoolSave(ssl, input, headerSz + finishedSz)) != 0) if ((ret = DtlsPoolSave(ssl, input, headerSz + finishedSz)) != 0)
return ret; return ret;
} }
@ -10243,7 +10241,7 @@ int SendCertificate(WOLFSSL* ssl)
} }
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0) if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0)
return ret; return ret;
} }
@ -10338,7 +10336,7 @@ int SendCertificateRequest(WOLFSSL* ssl)
i += REQ_HEADER_SZ; */ i += REQ_HEADER_SZ; */
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0) if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0)
return ret; return ret;
} }
@ -10437,7 +10435,7 @@ static int BuildCertificateStatus(WOLFSSL* ssl, byte type, buffer* status,
ret = HashOutput(ssl, output, sendSz, 0); ret = HashOutput(ssl, output, sendSz, 0);
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (ret == 0 && IsDtlsSctpMode(ssl)) if (ret == 0 && IsDtlsNotSctpMode(ssl))
ret = DtlsPoolSave(ssl, output, sendSz); ret = DtlsPoolSave(ssl, output, sendSz);
#endif #endif
@ -12844,7 +12842,7 @@ static void PickHashSigAlgo(WOLFSSL* ssl,
} }
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0) if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0)
return ret; return ret;
} }
@ -15300,7 +15298,7 @@ int SendClientKeyExchange(WOLFSSL* ssl)
} }
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0) { if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0) {
goto exit_scke; goto exit_scke;
} }
@ -15777,7 +15775,7 @@ int SendCertificateVerify(WOLFSSL* ssl)
} }
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
ret = DtlsPoolSave(ssl, output, sendSz); ret = DtlsPoolSave(ssl, output, sendSz);
} }
#endif #endif
@ -16054,7 +16052,7 @@ int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
ssl->buffers.outputBuffer.length += sendSz; ssl->buffers.outputBuffer.length += sendSz;
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0) if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0)
return ret; return ret;
} }
@ -17378,7 +17376,7 @@ int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0) { if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0) {
goto exit_sske; goto exit_sske;
} }
@ -18561,7 +18559,7 @@ int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
AddHeaders(output, 0, server_hello_done, ssl); AddHeaders(output, 0, server_hello_done, ssl);
#ifdef WOLFSSL_DTLS #ifdef WOLFSSL_DTLS
if (IsDtlsSctpMode(ssl)) { if (IsDtlsNotSctpMode(ssl)) {
if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0) if ((ret = DtlsPoolSave(ssl, output, sendSz)) != 0)
return 0; return 0;
} }