Merge pull request #1689 from ejohnstown/atomic-dtls

DTLS and Atomic Encrypt Callback
This commit is contained in:
David Garske
2018-07-17 09:37:50 -07:00
committed by GitHub

View File

@ -13720,10 +13720,6 @@ int BuildMessage(WOLFSSL* ssl, byte* output, int outSz, const byte* input,
#endif #endif
ret = ssl->hmac(ssl, output + args->idx, output + ret = ssl->hmac(ssl, output + args->idx, output +
args->headerSz + args->ivSz, inSz, -1, type, 0); args->headerSz + args->ivSz, inSz, -1, type, 0);
#ifdef WOLFSSL_DTLS
if (ssl->options.dtls)
DtlsSEQIncrement(ssl, CUR_ORDER);
#endif
} }
if (ret != 0) if (ret != 0)
goto exit_buildmsg; goto exit_buildmsg;
@ -13752,6 +13748,11 @@ exit_buildmsg:
/* make sure build message state is reset */ /* make sure build message state is reset */
ssl->options.buildMsgState = BUILD_MSG_BEGIN; ssl->options.buildMsgState = BUILD_MSG_BEGIN;
#ifdef WOLFSSL_DTLS
if (ret == 0 && ssl->options.dtls)
DtlsSEQIncrement(ssl, CUR_ORDER);
#endif
/* return sz on success */ /* return sz on success */
if (ret == 0) if (ret == 0)
ret = args->sz; ret = args->sz;