mirror of https://github.com/wolfSSL/wolfssl
Merge pull request #8039 from douzzer/20241002-fix-for-cppcheck-force-source
20241002-fix-for-cppcheck-force-source
This commit is contained in:
commit
0668c6ea5d
|
@ -21730,16 +21730,19 @@ default:
|
|||
else
|
||||
#endif
|
||||
{
|
||||
#ifdef HAVE_ENCRYPT_THEN_MAC
|
||||
word16 startedETMRead = ssl->options.startedETMRead;
|
||||
#else
|
||||
word16 startedETMRead = 0;
|
||||
#endif
|
||||
/* With atomicUser the callback should have already included
|
||||
* the mac in the padding size. The ETM callback doesn't do
|
||||
* this for some reason. */
|
||||
if (ssl->specs.cipher_type != aead &&
|
||||
(!atomicUser || startedETMRead)) {
|
||||
if (ssl->specs.cipher_type != aead
|
||||
#ifdef ATOMIC_USER
|
||||
&& (!atomicUser
|
||||
#ifdef HAVE_ENCRYPT_THEN_MAC
|
||||
|| ssl->options.startedETMRead
|
||||
#endif /* HAVE_ENCRYPT_THEN_MAC */
|
||||
)
|
||||
#endif /* !ATOMIC_USER */
|
||||
)
|
||||
{
|
||||
/* consider MAC as padding */
|
||||
ssl->keys.padSz += MacSize(ssl);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue