Skip to content

Commit 691c7ec

Browse files
TofMassilia13320Grom-
TofMassilia13320
authored and
Grom-
committed
[api/services/certificates] Update enum comparison
1 parent 0fabc4d commit 691c7ec

10 files changed

+26
-26
lines changed

‎api/stse_asymmetric_keys_management.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ stse_ReturnCode_t stse_sign_for_generic_public_key_slot(
183183
PLAT_UI8 hash_data[hash_length];
184184

185185
if (pPrivate_key == NULL || pPayload == NULL || pSignature == NULL ||
186-
private_key_type == STSE_ECC_KT_INVALID || hash_algo == STSE_SHA_INVALID) {
186+
private_key_type >= STSE_ECC_KT_INVALID || hash_algo >= STSE_SHA_INVALID) {
187187
return STSE_SERVICE_INVALID_PARAMETER;
188188
}
189189

‎api/stse_device_authentication.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ stse_ReturnCode_t stse_device_authenticate(
165165

166166
/* - Get ECC key type from leaf certificate */
167167
stse_ecc_key_type_t key_type = stse_certificate_get_key_type(&leaf_certificate);
168-
if (key_type == STSE_ECC_KT_INVALID) {
168+
if (key_type >= STSE_ECC_KT_INVALID) {
169169
return (STSE_UNEXPECTED_ERROR);
170170
}
171171

‎api/stse_symmetric_keys_management.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ stse_ReturnCode_t stse_host_key_provisioning(
487487
return (STSE_API_HANDLER_NOT_INITIALISED);
488488
}
489489

490-
if (host_key_type == STSAFEA_AES_INVALID_HOST_KEY || host_keys == NULL) {
490+
if (host_key_type >= STSAFEA_AES_INVALID_HOST_KEY || host_keys == NULL) {
491491
return (STSE_API_INVALID_PARAMETER);
492492
}
493493

@@ -527,7 +527,7 @@ stse_ReturnCode_t stse_host_key_provisioning_wrapped(
527527
return (STSE_API_HANDLER_NOT_INITIALISED);
528528
}
529529

530-
if (host_key_type == STSAFEA_AES_INVALID_HOST_KEY || host_keys == NULL) {
530+
if (host_key_type >= STSAFEA_AES_INVALID_HOST_KEY || host_keys == NULL) {
531531
return (STSE_API_INVALID_PARAMETER);
532532
}
533533

@@ -614,7 +614,7 @@ stse_ReturnCode_t stse_host_key_provisioning_wrapped_authenticated(
614614
return (STSE_API_HANDLER_NOT_INITIALISED);
615615
}
616616

617-
if (host_key_type == STSAFEA_AES_INVALID_HOST_KEY || host_keys == NULL) {
617+
if (host_key_type >= STSAFEA_AES_INVALID_HOST_KEY || host_keys == NULL) {
618618
return (STSE_API_INVALID_PARAMETER);
619619
}
620620

@@ -698,7 +698,7 @@ stse_ReturnCode_t stse_establish_host_key(
698698
return (STSE_API_HANDLER_NOT_INITIALISED);
699699
}
700700

701-
if (host_secure_channel_keys_type == STSAFEA_AES_INVALID_HOST_KEY || host_mac_key == NULL || host_cipher_key == NULL
701+
if (host_secure_channel_keys_type >= STSAFEA_AES_INVALID_HOST_KEY || host_mac_key == NULL || host_cipher_key == NULL
702702
#ifdef STSE_CONF_ECC_EDWARD_25519
703703
|| ecdh_key_type == STSE_ECC_KT_ED25519
704704
#endif /* STSE_CONF_ECC_EDWARD_25519 */
@@ -832,7 +832,7 @@ stse_ReturnCode_t stse_establish_host_key_authenticated(
832832
return (STSE_API_HANDLER_NOT_INITIALISED);
833833
}
834834

835-
if (host_secure_channel_keys_type == STSAFEA_AES_INVALID_HOST_KEY || host_mac_key == NULL || host_cipher_key == NULL
835+
if (host_secure_channel_keys_type >= STSAFEA_AES_INVALID_HOST_KEY || host_mac_key == NULL || host_cipher_key == NULL
836836
#ifdef STSE_CONF_ECC_EDWARD_25519
837837
|| ecdh_key_type == STSE_ECC_KT_ED25519
838838
#endif /* STSE_CONF_ECC_EDWARD_25519 */

‎certificate/stse_certificate_crypto.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ stse_ReturnCode_t stse_certificate_verify_cert_signature(const stse_certificate_
2828
}
2929

3030
hash_algo = stse_certificate_get_sig_hash_algo(child);
31-
if (hash_algo == STSE_SHA_INVALID) {
31+
if (hash_algo >= STSE_SHA_INVALID) {
3232
return (STSE_CERT_UNSUPPORTED_FEATURE);
3333
}
3434

@@ -88,7 +88,7 @@ stse_ReturnCode_t stse_certificate_verify_signature(const stse_certificate_t *ce
8888
}
8989

9090
key_type = stse_certificate_get_key_type(cert);
91-
if (key_type == STSE_ECC_KT_INVALID) {
91+
if (key_type >= STSE_ECC_KT_INVALID) {
9292
return (STSE_CERT_INVALID_CERTIFICATE);
9393
}
9494

‎services/stsafea/stsafea_asymmetric_key_slots.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ stse_ReturnCode_t stsafea_generate_ecc_key_pair(
145145
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
146146
}
147147

148-
if ((pPublic_key == NULL) || (key_type == STSE_ECC_KT_INVALID)) {
148+
if ((pPublic_key == NULL) || (key_type >= STSE_ECC_KT_INVALID)) {
149149
return (STSE_SERVICE_INVALID_PARAMETER);
150150
}
151151

@@ -221,7 +221,7 @@ stse_ReturnCode_t stsafea_generate_ECDHE_key_pair(
221221
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
222222
}
223223

224-
if (key_type == STSE_ECC_KT_INVALID) {
224+
if (key_type >= STSE_ECC_KT_INVALID) {
225225
return (STSE_SERVICE_INVALID_PARAMETER);
226226
}
227227

‎services/stsafea/stsafea_ecc.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ stse_ReturnCode_t stsafea_start_volatile_KEK_session(
3232
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
3333
}
3434

35-
if (host_ecdhe_public_key == NULL || key_type == STSE_ECC_KT_INVALID) {
35+
if (host_ecdhe_public_key == NULL || key_type >= STSE_ECC_KT_INVALID) {
3636
return (STSE_SERVICE_INVALID_PARAMETER);
3737
}
3838

@@ -105,7 +105,7 @@ stse_ReturnCode_t stsafea_start_volatile_KEK_session_authenticated(
105105
}
106106

107107
if (host_ecdhe_public_key == NULL || pSignature == NULL ||
108-
ecdhe_key_type == STSE_ECC_KT_INVALID || signature_key_type == STSE_ECC_KT_INVALID) {
108+
ecdhe_key_type >= STSE_ECC_KT_INVALID || signature_key_type >= STSE_ECC_KT_INVALID) {
109109
return (STSE_SERVICE_INVALID_PARAMETER);
110110
}
111111

@@ -259,7 +259,7 @@ stse_ReturnCode_t stsafea_ecc_verify_signature(
259259

260260
if (pPublic_key == NULL || pSignature == NULL ||
261261
pMessage == NULL || pSignature_validity == NULL ||
262-
key_type == STSE_ECC_KT_INVALID) {
262+
key_type >= STSE_ECC_KT_INVALID) {
263263
return (STSE_SERVICE_INVALID_PARAMETER);
264264
}
265265

@@ -360,7 +360,7 @@ stse_ReturnCode_t stsafea_ecc_generate_signature(
360360
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
361361
}
362362

363-
if (pMessage == NULL || pSignature == NULL || key_type == STSE_ECC_KT_INVALID) {
363+
if (pMessage == NULL || pSignature == NULL || key_type >= STSE_ECC_KT_INVALID) {
364364
return (STSE_SERVICE_INVALID_PARAMETER);
365365
}
366366

@@ -397,7 +397,7 @@ stse_ReturnCode_t stsafea_ecc_establish_shared_secret(
397397
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
398398
}
399399

400-
if (pPublic_key == NULL || pShared_secret == NULL || key_type == STSE_ECC_KT_INVALID) {
400+
if (pPublic_key == NULL || pShared_secret == NULL || key_type >= STSE_ECC_KT_INVALID) {
401401
return (STSE_SERVICE_INVALID_PARAMETER);
402402
}
403403

@@ -477,7 +477,7 @@ stse_ReturnCode_t stsafea_ecc_decompress_public_key(
477477
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
478478
}
479479

480-
if (pPublic_key_X == NULL || pPublic_key_Y == NULL || key_type == STSE_ECC_KT_INVALID) {
480+
if (pPublic_key_X == NULL || pPublic_key_Y == NULL || key_type >= STSE_ECC_KT_INVALID) {
481481
return (STSE_SERVICE_INVALID_PARAMETER);
482482
}
483483

‎services/stsafea/stsafea_entity_auth.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ stse_ReturnCode_t stsafea_verify_entity_signature(
6565
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
6666
}
6767

68-
if (pSignature == NULL || pSignature_validity == NULL || key_type == STSE_ECC_KT_INVALID) {
68+
if (pSignature == NULL || pSignature_validity == NULL || key_type >= STSE_ECC_KT_INVALID) {
6969
return (STSE_SERVICE_INVALID_PARAMETER);
7070
}
7171

‎services/stsafea/stsafea_host_key_slot.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ stse_ReturnCode_t stsafea_establish_host_key(
265265
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
266266
}
267267

268-
if ((host_ecdh_public_key_type == STSE_ECC_KT_INVALID) || (pPublic_key == NULL) || (host_keys_type >= STSAFEA_AES_INVALID_HOST_KEY)) {
268+
if ((host_ecdh_public_key_type >= STSE_ECC_KT_INVALID) || (pPublic_key == NULL) || (host_keys_type >= STSAFEA_AES_INVALID_HOST_KEY)) {
269269
return (STSE_SERVICE_INVALID_PARAMETER);
270270
}
271271

@@ -337,9 +337,9 @@ stse_ReturnCode_t stsafea_establish_host_key_authenticated(
337337
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
338338
}
339339

340-
if ((host_ecdh_public_key_type == STSE_ECC_KT_INVALID) || (pPublic_key == NULL) ||
341-
(host_keys_type >= STSAFEA_AES_INVALID_HOST_KEY) || (signature_public_key_type == STSE_ECC_KT_INVALID) ||
342-
(signature_hash_algo == STSE_SHA_INVALID) || (pSignature == NULL)) {
340+
if ((host_ecdh_public_key_type >= STSE_ECC_KT_INVALID) || (pPublic_key == NULL) ||
341+
(host_keys_type >= STSAFEA_AES_INVALID_HOST_KEY) || (signature_public_key_type >= STSE_ECC_KT_INVALID) ||
342+
(signature_hash_algo >= STSE_SHA_INVALID) || (pSignature == NULL)) {
343343
return (STSE_SERVICE_INVALID_PARAMETER);
344344
}
345345

‎services/stsafea/stsafea_public_key_slots.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ stse_ReturnCode_t stsafea_query_generic_public_key_slot_value(
137137
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
138138
}
139139

140-
if (key_type == STSE_ECC_KT_INVALID || pPublic_key == NULL) {
140+
if (key_type >= STSE_ECC_KT_INVALID || pPublic_key == NULL) {
141141
return (STSE_SERVICE_INVALID_PARAMETER);
142142
}
143143

@@ -214,7 +214,7 @@ stse_ReturnCode_t stsafea_write_generic_ecc_public_key(
214214
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
215215
}
216216

217-
if (pPublic_key == NULL || (PLAT_I8)key_type >= (PLAT_I8)STSE_ECC_KT_INVALID) {
217+
if (pPublic_key == NULL || key_type >= STSE_ECC_KT_INVALID) {
218218
return (STSE_SERVICE_INVALID_PARAMETER);
219219
}
220220

‎services/stsafea/stsafea_symmetric_key_slots.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ stse_ReturnCode_t stsafea_establish_symmetric_key(
222222
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
223223
}
224224

225-
if (host_ecdhe_public_key == NULL || key_type == STSE_ECC_KT_INVALID) {
225+
if (host_ecdhe_public_key == NULL || key_type >= STSE_ECC_KT_INVALID) {
226226
return (STSE_SERVICE_INVALID_PARAMETER);
227227
}
228228

@@ -299,7 +299,7 @@ stse_ReturnCode_t stsafea_establish_symmetric_key_authenticated(
299299
return (STSE_SERVICE_HANDLER_NOT_INITIALISED);
300300
}
301301

302-
if (host_ecdhe_public_key == NULL || pSignature == NULL || key_type == STSE_ECC_KT_INVALID) {
302+
if (host_ecdhe_public_key == NULL || pSignature == NULL || key_type >= STSE_ECC_KT_INVALID) {
303303
return (STSE_SERVICE_INVALID_PARAMETER);
304304
}
305305

0 commit comments

Comments
 (0)