@@ -479,17 +479,13 @@ int mbedtls_pk_verify_restartable(mbedtls_pk_context *ctx,
479
479
480
480
481
481
#if defined(MBEDTLS_USE_PSA_CRYPTO )
482
- if (ctx -> pk_info -> type == MBEDTLS_PK_RSA ) {
483
- return ctx -> pk_info -> verify_func (ctx -> pk_ctx , md_alg , hash , hash_len ,
484
- sig , sig_len );
485
- } else {
482
+ if (ctx -> pk_info -> type != MBEDTLS_PK_RSA ) {
486
483
return ctx -> pk_info -> verify_func (ctx , md_alg , hash , hash_len ,
487
484
sig , sig_len );
488
- }
489
- #else /* MBEDTLS_USE_PSA_CRYPTO */
485
+ } else
486
+ #endif /* MBEDTLS_USE_PSA_CRYPTO */
490
487
return ctx -> pk_info -> verify_func (ctx -> pk_ctx , md_alg , hash , hash_len ,
491
488
sig , sig_len );
492
- #endif /* MBEDTLS_USE_PSA_CRYPTO */
493
489
}
494
490
495
491
/*
@@ -820,14 +816,11 @@ int mbedtls_pk_check_pair(const mbedtls_pk_context *pub,
820
816
}
821
817
822
818
#if defined(MBEDTLS_USE_PSA_CRYPTO )
823
- if (pub -> pk_info -> type == MBEDTLS_PK_RSA ) {
824
- return prv -> pk_info -> check_pair_func (pub -> pk_ctx , prv -> pk_ctx , f_rng , p_rng );
825
- } else {
819
+ if (pub -> pk_info -> type != MBEDTLS_PK_RSA ) {
826
820
return prv -> pk_info -> check_pair_func (pub , prv , f_rng , p_rng );
827
- }
828
- #else
829
- return prv -> pk_info -> check_pair_func (pub -> pk_ctx , prv -> pk_ctx , f_rng , p_rng );
821
+ } else
830
822
#endif
823
+ return prv -> pk_info -> check_pair_func (pub -> pk_ctx , prv -> pk_ctx , f_rng , p_rng );
831
824
}
832
825
833
826
/*
@@ -909,7 +902,7 @@ int mbedtls_pk_get_ec_public_key_props(mbedtls_pk_context *pk,
909
902
if ((pk == NULL ) || (ec_curve == NULL ) || (bits == NULL )) {
910
903
return MBEDTLS_ERR_PK_BAD_INPUT_DATA ;
911
904
}
912
- if ((pk -> MBEDTLS_PRIVATE (pk_ec_family ) == 0 ) ||
905
+ if ((pk -> MBEDTLS_PRIVATE (pk_ec_family ) == 0 ) ||
913
906
(pk -> MBEDTLS_PRIVATE (pk_bits ) == 0 )) {
914
907
return MBEDTLS_ERR_PK_BAD_INPUT_DATA ;
915
908
}
0 commit comments