Skip to content

Cherry-pick to earlgrey_1.0.0: [crypto] Fix use of AES mode constant from incompatible enum #29641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lowrisc-ci wants to merge 1 commit into
base: earlgrey_1.0.0
Choose a base branch
from
+4 −4
Open

Cherry-pick to earlgrey_1.0.0: [crypto] Fix use of AES mode constant from incompatible enum #29641

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sw/device/lib/crypto/impl/aes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,10 +340,10 @@ static otcrypto_status_t otcrypto_aes_impl(
// Construct the IV and check its length. ECB mode will ignore the IV, so in
// this case it is left uninitialized.
aes_block_t aes_iv;
if (aes_mode == kAesCipherModeEcb) {
HARDENED_CHECK_EQ(launder32(aes_mode), kAesCipherModeEcb);
if (aes_mode == kOtcryptoAesModeEcb) {
HARDENED_CHECK_EQ(launder32(aes_mode), kOtcryptoAesModeEcb);
} else {
HARDENED_CHECK_NE(launder32(aes_mode), kAesCipherModeEcb);
HARDENED_CHECK_NE(launder32(aes_mode), kOtcryptoAesModeEcb);

// The IV must be exactly one block long.
if (iv->len != kAesBlockNumWords) {
Expand Down Expand Up @@ -457,7 +457,7 @@ static otcrypto_status_t otcrypto_aes_impl(
HARDENED_TRY(aes_verify_ctrl_aux_reg());

// Deinitialize the AES block and update the IV (in ECB mode, skip the IV).
if (aes_mode == kAesCipherModeEcb) {
if (aes_mode == kOtcryptoAesModeEcb) {
HARDENED_TRY(aes_end(NULL));
} else {
HARDENED_TRY(aes_end(&aes_iv));
Expand Down
Loading