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

src/internal.c: in ProcessReplyEx() in the verifyMessage case, refactor some gating/conditionalization around ATOMIC_USER, HAVE_ENCRYPT_THEN_MAC, atomicUser, and ssl->options.startedETMRead, to avoid "Logical disjunction always evaluates to true" from cppcheck incorrectLogicOperator (via multi-test cppcheck-force-source) (warned code introduced by 99a99e3d6e).

Browse Source
This commit is contained in:
Daniel Pouzzner
2024-10-02 19:19:39 -05:00
parent e814d1baea
commit b81cc50a70
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/internal.c
View File

@ -21730,16 +21730,19 @@ default:
else else
#endif #endif
{ {
#ifdef HAVE_ENCRYPT_THEN_MAC
word16 startedETMRead = ssl->options.startedETMRead;
#else
word16 startedETMRead = 0;
#endif
/* With atomicUser the callback should have already included /* With atomicUser the callback should have already included
* the mac in the padding size. The ETM callback doesn't do * the mac in the padding size. The ETM callback doesn't do
* this for some reason. */ * this for some reason. */
if (ssl->specs.cipher_type != aead && if (ssl->specs.cipher_type != aead
(!atomicUser || startedETMRead)) { #ifdef ATOMIC_USER
&& (!atomicUser
#ifdef HAVE_ENCRYPT_THEN_MAC
|| ssl->options.startedETMRead
#endif /* HAVE_ENCRYPT_THEN_MAC */
)
#endif /* !ATOMIC_USER */
)
{
/* consider MAC as padding */ /* consider MAC as padding */
ssl->keys.padSz += MacSize(ssl); ssl->keys.padSz += MacSize(ssl);
} }