Properly initialize AEAD cipher flags in OpenSSL backend #20853
Conversation
jordikroon
force-pushed
the
fix/gh20851
branch
from
2cff66b to
7de1357
Compare
jordikroon
changed the title
|
Please review commits 1 by 1 since I am not sure if the change from The second commit allows AAD to be null since it behaves differently than when only an empty string is given. The matches other implementations like |
bukka
left a comment
bukka
left a comment
There was a problem hiding this comment.
This looks reasonable. Just some minor things really.
| #if defined(EVP_CIPH_FLAG_AEAD_CIPHER) | ||
| if (EVP_CIPHER_flags(cipher_type) & EVP_CIPH_FLAG_AEAD_CIPHER) { | ||
| php_openssl_set_aead_flags(mode); | ||
| } | ||
| #endif |
There was a problem hiding this comment.
It would be better to add EVP_CIPH_SIV_MODE to the switch if exists and set the right mode if there are some differences.
| /* Only pass AAD to OpenSSL if caller provided it. | ||
| This makes NULL mean zero AAD items, while "" with len 0 means one empty AAD item. */ | ||
| if (mode->is_aead && aad != NULL && !EVP_CipherUpdate(cipher_ctx, NULL, &i, (const unsigned char *)aad, (int)aad_len)) { |
There was a problem hiding this comment.
Is this for SIV or is this for all modes. I thought that empty string won't make difference but I guess it might.
In general allowing null should be fine for master so it's not really a problem. Just want to know the reasoning as I haven't checked this propertly.
2 participants
Fixes #20851
Add support for AEAD ciphers like AES-SIV by detecting and initializing AEAD flags during cipher mode loading.
Includes test case for AES-256-SIV encryption/decryption roundtrip.