lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Extend blinding to RSA result check

Browse Source 
Signed-off-by: Janos Follath <janos.follath@arm.com>
This commit is contained in:
Janos Follath
2024-01-08 15:19:11 +00:00
committed by Dave Rodgman
parent aa6760d7b5
commit 601bffc4ce
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
library/rsa.c
View File

@ -909,7 +909,7 @@ int mbedtls_rsa_private(mbedtls_rsa_context *ctx,
/* Temporaries holding the initial input and the double /* Temporaries holding the initial input and the double
* checked result; should be the same in the end. */ * checked result; should be the same in the end. */
mbedtls_mpi I, C; mbedtls_mpi input_blinded, check_result_blinded;
RSA_VALIDATE_RET(ctx != NULL); RSA_VALIDATE_RET(ctx != NULL);
RSA_VALIDATE_RET(input != NULL); RSA_VALIDATE_RET(input != NULL);
@ -946,8 +946,8 @@ int mbedtls_rsa_private(mbedtls_rsa_context *ctx,
mbedtls_mpi_init(&TP); mbedtls_mpi_init(&TQ); mbedtls_mpi_init(&TP); mbedtls_mpi_init(&TQ);
#endif #endif
mbedtls_mpi_init(&I); mbedtls_mpi_init(&input_blinded);
mbedtls_mpi_init(&C); mbedtls_mpi_init(&check_result_blinded);
/* End of MPI initialization */ /* End of MPI initialization */
@ -957,8 +957,6 @@ int mbedtls_rsa_private(mbedtls_rsa_context *ctx,
goto cleanup; goto cleanup;
} }
MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&I, &T));
if (f_rng != NULL) { if (f_rng != NULL) {
/* /*
* Blinding * Blinding
@ -1010,6 +1008,9 @@ int mbedtls_rsa_private(mbedtls_rsa_context *ctx,
#endif /* MBEDTLS_RSA_NO_CRT */ #endif /* MBEDTLS_RSA_NO_CRT */
} }
/* Make a copy of the input (after blinding if there was any) */
MBEDTLS_MPI_CHK(mbedtls_mpi_copy(&input_blinded, &T));
#if defined(MBEDTLS_RSA_NO_CRT) #if defined(MBEDTLS_RSA_NO_CRT)
MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&T, &T, D, &ctx->N, &ctx->RN)); MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&T, &T, D, &ctx->N, &ctx->RN));
#else #else
@ -1037,6 +1038,14 @@ int mbedtls_rsa_private(mbedtls_rsa_context *ctx,
MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&T, &TQ, &TP)); MBEDTLS_MPI_CHK(mbedtls_mpi_add_mpi(&T, &TQ, &TP));
#endif /* MBEDTLS_RSA_NO_CRT */ #endif /* MBEDTLS_RSA_NO_CRT */
/* Verify the result to prevent glitching attacks. */
MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&check_result_blinded, &T, &ctx->E,
&ctx->N, &ctx->RN));
if (mbedtls_mpi_cmp_mpi(&check_result_blinded, &input_blinded) != 0) {
ret = MBEDTLS_ERR_RSA_VERIFY_FAILED;
goto cleanup;
}
if (f_rng != NULL) { if (f_rng != NULL) {
/* /*
* Unblind * Unblind
@ -1045,14 +1054,6 @@ int mbedtls_rsa_private(mbedtls_rsa_context *ctx,
MBEDTLS_MPI_CHK(rsa_unblind(&T, &ctx->Vf, &ctx->N)); MBEDTLS_MPI_CHK(rsa_unblind(&T, &ctx->Vf, &ctx->N));
} }
/* Verify the result to prevent glitching attacks. */
MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&C, &T, &ctx->E,
&ctx->N, &ctx->RN));
if (mbedtls_mpi_cmp_mpi(&C, &I) != 0) {
ret = MBEDTLS_ERR_RSA_VERIFY_FAILED;
goto cleanup;
}
olen = ctx->len; olen = ctx->len;
MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&T, output, olen)); MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&T, output, olen));
@ -1082,8 +1083,8 @@ cleanup:
mbedtls_mpi_free(&TP); mbedtls_mpi_free(&TQ); mbedtls_mpi_free(&TP); mbedtls_mpi_free(&TQ);
#endif #endif
mbedtls_mpi_free(&C); mbedtls_mpi_free(&check_result_blinded);
mbedtls_mpi_free(&I); mbedtls_mpi_free(&input_blinded);
if (ret != 0 && ret >= -0x007f) { if (ret != 0 && ret >= -0x007f) {
return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_RSA_PRIVATE_FAILED, ret); return MBEDTLS_ERROR_ADD(MBEDTLS_ERR_RSA_PRIVATE_FAILED, ret);