mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-07-29 18:27:29 +02:00
Merge pull request #4880 from julek-wolfssl/plain-alert
Detect if we are processing a plaintext alert
This commit is contained in:
@ -16557,20 +16557,19 @@ static int DoAlert(WOLFSSL* ssl, byte* input, word32* inOutIdx, int* type)
|
||||
READ_PROTO, ssl->heap);
|
||||
#endif
|
||||
|
||||
#ifndef WOLFSSL_AEAD_ONLY
|
||||
if (ssl->specs.cipher_type == block) {
|
||||
if (ssl->options.tls1_1)
|
||||
ivExtra = ssl->specs.block_size;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
if (ssl->specs.cipher_type == aead) {
|
||||
if (CipherHasExpIV(ssl))
|
||||
ivExtra = AESGCM_EXP_IV_SZ;
|
||||
}
|
||||
dataSz -= ivExtra;
|
||||
|
||||
if (IsEncryptionOn(ssl, 0)) {
|
||||
#ifndef WOLFSSL_AEAD_ONLY
|
||||
if (ssl->specs.cipher_type == block) {
|
||||
if (ssl->options.tls1_1)
|
||||
ivExtra = ssl->specs.block_size;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
if (ssl->specs.cipher_type == aead) {
|
||||
if (CipherHasExpIV(ssl))
|
||||
ivExtra = AESGCM_EXP_IV_SZ;
|
||||
}
|
||||
dataSz -= ivExtra;
|
||||
dataSz -= ssl->keys.padSz;
|
||||
#if defined(HAVE_ENCRYPT_THEN_MAC) && !defined(WOLFSSL_AEAD_ONLY)
|
||||
if (ssl->options.startedETMRead)
|
||||
|
Reference in New Issue
Block a user