Skip to content

Commit 824735a

Browse files
TofMassilia13320Grom-
authored andcommitted
[api] Update key type check (pub issue #60)
1 parent 15f2e5c commit 824735a

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

api/stse_ecc.c

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,7 @@ stse_ReturnCode_t stse_ecc_establish_shared_secret(
113113
}
114114
#endif /* STSE_CONF_STSAFE_L_SUPPORT */
115115

116-
if (pPublic_key == NULL || pShared_secret == NULL
117-
#ifdef STSE_CONF_ECC_CURVE_25519
118-
|| key_type == STSE_ECC_KT_CURVE25519
119-
#endif /* STSE_CONF_ECC_CURVE_25519 */
120-
) {
116+
if (pPublic_key == NULL || pShared_secret == NULL) {
121117
return (STSE_API_INVALID_PARAMETER);
122118
}
123119

@@ -150,14 +146,7 @@ stse_ReturnCode_t stse_ecc_decompress_public_key(
150146
}
151147
#endif /* STSE_CONF_STSAFE_L_SUPPORT */
152148

153-
if (pPublic_key_X == NULL || pPublic_key_Y == NULL
154-
#ifdef STSE_CONF_ECC_CURVE_25519
155-
|| key_type == STSE_ECC_KT_CURVE25519
156-
#endif /* STSE_CONF_ECC_CURVE_25519 */
157-
#ifdef STSE_CONF_ECC_EDWARD_25519
158-
|| key_type == STSE_ECC_KT_ED25519
159-
#endif /* STSE_CONF_ECC_EDWARD_25519 */
160-
) {
149+
if (pPublic_key_X == NULL || pPublic_key_Y == NULL) {
161150
return (STSE_API_INVALID_PARAMETER);
162151
}
163152

services/stsafel/stsafel_ecc.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ stse_ReturnCode_t stsafel_ecc_generate_signature(
3535
if (pSTSE == NULL) {
3636
return STSE_SERVICE_HANDLER_NOT_INITIALISED;
3737
}
38-
#ifdef STSE_CONF_ECC_EDWARD_25519
39-
if ((key_type != STSE_ECC_KT_ED25519) ||
40-
(challenge_length != STSAFEL_ECC_SIGNATURE_CHALLENGE_LENGTH) ||
38+
if ((challenge_length != STSAFEL_ECC_SIGNATURE_CHALLENGE_LENGTH) ||
4139
(pChallenge == NULL) ||
4240
(pSignature == NULL)) {
4341
return STSE_SERVICE_INVALID_PARAMETER;
4442
}
45-
#endif
43+
4644
/*- Create CMD frame and populate elements */
4745
stse_frame_allocate(CmdFrame);
4846
stse_frame_element_allocate_push(&CmdFrame, eCmd_header, STSAFEL_HEADER_SIZE, &cmd_header);

0 commit comments

Comments
 (0)