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

Merge pull request #8039 from douzzer/20241002-fix-for-cppcheck-force-source

Browse Source 
20241002-fix-for-cppcheck-force-source
This commit is contained in:
Sean Parkinson
2024-10-03 20:57:09 +10:00
committed by GitHub
parent e814d1baea b81cc50a70
commit 0668c6ea5d
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);
} }