Skip to content

Commit 26eedc9

Browse files
committed
[nrf noup] drivers: key_derivation: Fix ifdefs for WPA3-SAE
Fixes build issues due to the missing checks for PSA_NEED_OBERON_WPA3_SAE_H2E macro. This change is already taken in and will be a part of the future version of Oberon PSA Crypto. Signed-off-by: Anton Zyma <anton.zyma@nordicsemi.no>
1 parent c79b47b commit 26eedc9

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

oberon/drivers/oberon_key_derivation.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ static const uint8_t zero[PSA_HASH_MAX_SIZE] = { 0 };
2323

2424
#if defined(PSA_NEED_OBERON_HKDF) || defined(PSA_NEED_OBERON_PBKDF2_HMAC) || defined(PSA_NEED_OBERON_PBKDF2_AES_CMAC_PRF_128) || \
2525
defined(PSA_NEED_OBERON_SP800_108_COUNTER_HMAC) || defined(PSA_NEED_OBERON_SP800_108_COUNTER_CMAC) || \
26-
defined(PSA_NEED_OBERON_TLS12_PRF) || defined(PSA_NEED_OBERON_TLS12_PSK_TO_MS)
26+
defined(PSA_NEED_OBERON_TLS12_PRF) || defined(PSA_NEED_OBERON_TLS12_PSK_TO_MS) || defined(PSA_NEED_OBERON_WPA3_SAE_H2E)
2727
static psa_status_t oberon_setup_mac(
2828
oberon_key_derivation_operation_t *operation,
2929
const uint8_t *key, size_t key_length)
@@ -226,7 +226,7 @@ psa_status_t oberon_key_derivation_input_bytes(
226226
status = oberon_setup_mac(operation, data, data_length);
227227
if (status) goto exit;
228228
operation->salt_length = (uint16_t)data_length;
229-
#endif /* PSA_NEED_OBERON_HKDF || PSA_NEED_OBERON_HKDF_EXTRACT */
229+
#endif /* PSA_NEED_OBERON_HKDF || PSA_NEED_OBERON_HKDF_EXTRACT || PSA_NEED_OBERON_WPA3_SAE_H2E */
230230
#ifdef PSA_NEED_OBERON_SRP_PASSWORD_HASH
231231
} else if (operation->alg == OBERON_SRP_PASSWORD_HASH_ALG) {
232232
status = psa_driver_wrapper_hash_finish(&operation->hash_op, operation->data, sizeof operation->data, &length);
@@ -360,7 +360,7 @@ psa_status_t oberon_key_derivation_input_bytes(
360360
return PSA_SUCCESS;
361361
}
362362
#endif /* PSA_NEED_OBERON_HKDF || PSA_NEED_OBERON_HKDF_EXTRACT || PSA_NEED_OBERON_HKDF_EXPAND ||
363-
PSA_NEED_OBERON_SRP_PASSWORD_HASH || PSA_NEED_OBERON_WPA3_SAE_PT */
363+
PSA_NEED_OBERON_SRP_PASSWORD_HASH || PSA_NEED_OBERON_WPA3_SAE_H2E */
364364

365365
#if defined(PSA_NEED_OBERON_PBKDF2_HMAC) || defined(PSA_NEED_OBERON_PBKDF2_AES_CMAC_PRF_128) || \
366366
defined(PSA_NEED_OBERON_SRP_PASSWORD_HASH) || defined(PSA_NEED_OBERON_WPA3_SAE_H2E)
@@ -475,7 +475,8 @@ psa_status_t oberon_key_derivation_input_bytes(
475475
}
476476

477477
#if defined(PSA_NEED_OBERON_HKDF) || defined(PSA_NEED_OBERON_HKDF_EXTRACT) || \
478-
defined(PSA_NEED_OBERON_PBKDF2_AES_CMAC_PRF_128) || defined(PSA_NEED_OBERON_SRP_PASSWORD_HASH)
478+
defined(PSA_NEED_OBERON_PBKDF2_AES_CMAC_PRF_128) || defined(PSA_NEED_OBERON_SRP_PASSWORD_HASH) || \
479+
defined(PSA_NEED_OBERON_WPA3_SAE_H2E)
479480
exit:
480481
#ifdef PSA_NEED_OBERON_SRP_PASSWORD_HASH
481482
if (operation->alg == OBERON_PBKDF2_HMAC_ALG) {
@@ -712,7 +713,8 @@ psa_status_t oberon_key_derivation_output_bytes(
712713
#if defined(PSA_NEED_OBERON_HKDF) || defined(PSA_NEED_OBERON_HKDF_EXPAND) || \
713714
defined(PSA_NEED_OBERON_PBKDF2_HMAC) || defined(PSA_NEED_OBERON_PBKDF2_AES_CMAC_PRF_128) || \
714715
defined(PSA_NEED_OBERON_TLS12_PRF) || defined(PSA_NEED_OBERON_TLS12_PSK_TO_MS) || \
715-
defined(PSA_NEED_OBERON_SP800_108_COUNTER_HMAC) || defined(PSA_NEED_OBERON_SP800_108_COUNTER_CMAC)
716+
defined(PSA_NEED_OBERON_SP800_108_COUNTER_HMAC) || defined(PSA_NEED_OBERON_SP800_108_COUNTER_CMAC) || \
717+
defined(PSA_NEED_OBERON_WPA3_SAE_H2E)
716718
exit:
717719
psa_driver_wrapper_mac_abort(&operation->mac_op);
718720
return status;

0 commit comments

Comments
 (0)