eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify logic of driver step conversion

Browse source 
Take advantage of the contiguous nature of XYZ_KEY_SHARE, XYZ_ZK_PUBLIC
and XYZ_ZK_PROOF to simplify the conversion code.

Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann 2023-06-14 18:28:19 +01:00
parent 5d878f6c5f
commit 74a3d8c99c
1 changed files with 11 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

54
library/psa_crypto.c
View file

@ -7942,63 +7942,27 @@ exit:
static psa_crypto_driver_pake_step_t convert_jpake_computation_stage_to_driver_step( static psa_crypto_driver_pake_step_t convert_jpake_computation_stage_to_driver_step(
psa_jpake_computation_stage_t *stage) psa_jpake_computation_stage_t *stage)
{ {
psa_crypto_driver_pake_step_t key_share_step;
if (stage->round == PSA_JPAKE_FIRST) { if (stage->round == PSA_JPAKE_FIRST) {
int is_x1; int is_x1;
if (stage->io_mode == PSA_JPAKE_OUTPUT) { if (stage->io_mode == PSA_JPAKE_OUTPUT) {
is_x1 = (stage->outputs < 1); is_x1 = (stage->outputs < 1);
} else { } else {
is_x1 = (stage->inputs < 1); is_x1 = (stage->inputs < 1);
} }
if (is_x1) { key_share_step = is_x1 ?
switch (stage->step) { PSA_JPAKE_X1_STEP_KEY_SHARE :
case PSA_PAKE_STEP_KEY_SHARE: PSA_JPAKE_X2_STEP_KEY_SHARE;
return PSA_JPAKE_X1_STEP_KEY_SHARE;
case PSA_PAKE_STEP_ZK_PUBLIC:
return PSA_JPAKE_X1_STEP_ZK_PUBLIC;
case PSA_PAKE_STEP_ZK_PROOF:
return PSA_JPAKE_X1_STEP_ZK_PROOF;
default:
return PSA_JPAKE_STEP_INVALID;
}
} else {
switch (stage->step) {
case PSA_PAKE_STEP_KEY_SHARE:
return PSA_JPAKE_X2_STEP_KEY_SHARE;
case PSA_PAKE_STEP_ZK_PUBLIC:
return PSA_JPAKE_X2_STEP_ZK_PUBLIC;
case PSA_PAKE_STEP_ZK_PROOF:
return PSA_JPAKE_X2_STEP_ZK_PROOF;
default:
return PSA_JPAKE_STEP_INVALID;
}
}
} else if (stage->round == PSA_JPAKE_SECOND) { } else if (stage->round == PSA_JPAKE_SECOND) {
if (stage->io_mode == PSA_JPAKE_OUTPUT) { key_share_step = (stage->io_mode == PSA_JPAKE_OUTPUT) ?
switch (stage->step) { PSA_JPAKE_X2S_STEP_KEY_SHARE :
case PSA_PAKE_STEP_KEY_SHARE: PSA_JPAKE_X4S_STEP_KEY_SHARE;
return PSA_JPAKE_X2S_STEP_KEY_SHARE;
case PSA_PAKE_STEP_ZK_PUBLIC:
return PSA_JPAKE_X2S_STEP_ZK_PUBLIC;
case PSA_PAKE_STEP_ZK_PROOF:
return PSA_JPAKE_X2S_STEP_ZK_PROOF;
default:
return PSA_JPAKE_STEP_INVALID;
}
} else { } else {
switch (stage->step) {
case PSA_PAKE_STEP_KEY_SHARE:
return PSA_JPAKE_X4S_STEP_KEY_SHARE;
case PSA_PAKE_STEP_ZK_PUBLIC:
return PSA_JPAKE_X4S_STEP_ZK_PUBLIC;
case PSA_PAKE_STEP_ZK_PROOF:
return PSA_JPAKE_X4S_STEP_ZK_PROOF;
default:
return PSA_JPAKE_STEP_INVALID; return PSA_JPAKE_STEP_INVALID;
} }
} return key_share_step + stage->step - PSA_PAKE_STEP_KEY_SHARE;
}
return PSA_JPAKE_STEP_INVALID;
} }
#endif /* PSA_WANT_ALG_JPAKE */ #endif /* PSA_WANT_ALG_JPAKE */