Merge pull request #8702 from minosgalanakis/update/dhm_context_in_programs_5015
[MBEDTLS_PRIVATE] Update dhm context in programs
This commit is contained in:
commit
c3d17cde46
2 changed files with 19 additions and 12 deletions
|
@ -66,7 +66,7 @@ int main(void)
|
|||
mbedtls_dhm_context dhm;
|
||||
mbedtls_aes_context aes;
|
||||
|
||||
mbedtls_mpi N, P, Q, D, E;
|
||||
mbedtls_mpi N, P, Q, D, E, dhm_P, dhm_G;
|
||||
|
||||
mbedtls_net_init(&listen_fd);
|
||||
mbedtls_net_init(&client_fd);
|
||||
|
@ -75,8 +75,8 @@ int main(void)
|
|||
mbedtls_ctr_drbg_init(&ctr_drbg);
|
||||
|
||||
mbedtls_mpi_init(&N); mbedtls_mpi_init(&P); mbedtls_mpi_init(&Q);
|
||||
mbedtls_mpi_init(&D); mbedtls_mpi_init(&E);
|
||||
|
||||
mbedtls_mpi_init(&D); mbedtls_mpi_init(&E); mbedtls_mpi_init(&dhm_P);
|
||||
mbedtls_mpi_init(&dhm_G);
|
||||
/*
|
||||
* 1. Setup the RNG
|
||||
*/
|
||||
|
@ -141,8 +141,9 @@ int main(void)
|
|||
goto exit;
|
||||
}
|
||||
|
||||
if (mbedtls_mpi_read_file(&dhm.MBEDTLS_PRIVATE(P), 16, f) != 0 ||
|
||||
mbedtls_mpi_read_file(&dhm.MBEDTLS_PRIVATE(G), 16, f) != 0) {
|
||||
if ((ret = mbedtls_mpi_read_file(&dhm_P, 16, f)) != 0 ||
|
||||
(ret = mbedtls_mpi_read_file(&dhm_G, 16, f)) != 0 ||
|
||||
(ret = mbedtls_dhm_set_group(&dhm, &dhm_P, &dhm_G) != 0)) {
|
||||
mbedtls_printf(" failed\n ! Invalid DH parameter file\n\n");
|
||||
fclose(f);
|
||||
goto exit;
|
||||
|
@ -176,7 +177,7 @@ int main(void)
|
|||
memset(buf, 0, sizeof(buf));
|
||||
|
||||
if ((ret =
|
||||
mbedtls_dhm_make_params(&dhm, (int) mbedtls_mpi_size(&dhm.MBEDTLS_PRIVATE(P)), buf, &n,
|
||||
mbedtls_dhm_make_params(&dhm, (int) mbedtls_dhm_get_len(&dhm), buf, &n,
|
||||
mbedtls_ctr_drbg_random, &ctr_drbg)) != 0) {
|
||||
mbedtls_printf(" failed\n ! mbedtls_dhm_make_params returned %d\n\n", ret);
|
||||
goto exit;
|
||||
|
@ -286,7 +287,8 @@ int main(void)
|
|||
exit:
|
||||
|
||||
mbedtls_mpi_free(&N); mbedtls_mpi_free(&P); mbedtls_mpi_free(&Q);
|
||||
mbedtls_mpi_free(&D); mbedtls_mpi_free(&E);
|
||||
mbedtls_mpi_free(&D); mbedtls_mpi_free(&E); mbedtls_mpi_free(&dhm_P);
|
||||
mbedtls_mpi_free(&dhm_G);
|
||||
|
||||
mbedtls_net_free(&client_fd);
|
||||
mbedtls_net_free(&listen_fd);
|
||||
|
|
|
@ -1089,20 +1089,24 @@ int main(int argc, char *argv[])
|
|||
mbedtls_dhm_context dhm;
|
||||
size_t olen;
|
||||
size_t n;
|
||||
mbedtls_mpi P, G;
|
||||
mbedtls_mpi_init(&P); mbedtls_mpi_init(&G);
|
||||
|
||||
for (i = 0; (size_t) i < sizeof(dhm_sizes) / sizeof(dhm_sizes[0]); i++) {
|
||||
mbedtls_dhm_init(&dhm);
|
||||
|
||||
if (mbedtls_mpi_read_binary(&dhm.MBEDTLS_PRIVATE(P), dhm_P[i],
|
||||
if (mbedtls_mpi_read_binary(&P, dhm_P[i],
|
||||
dhm_P_size[i]) != 0 ||
|
||||
mbedtls_mpi_read_binary(&dhm.MBEDTLS_PRIVATE(G), dhm_G[i],
|
||||
dhm_G_size[i]) != 0) {
|
||||
mbedtls_mpi_read_binary(&G, dhm_G[i],
|
||||
dhm_G_size[i]) != 0 ||
|
||||
mbedtls_dhm_set_group(&dhm, &P, &G) != 0) {
|
||||
mbedtls_exit(1);
|
||||
}
|
||||
|
||||
n = mbedtls_mpi_size(&dhm.MBEDTLS_PRIVATE(P));
|
||||
n = mbedtls_dhm_get_len(&dhm);
|
||||
mbedtls_dhm_make_public(&dhm, (int) n, buf, n, myrand, NULL);
|
||||
if (mbedtls_mpi_copy(&dhm.MBEDTLS_PRIVATE(GY), &dhm.MBEDTLS_PRIVATE(GX)) != 0) {
|
||||
|
||||
if (mbedtls_dhm_read_public(&dhm, buf, n) != 0) {
|
||||
mbedtls_exit(1);
|
||||
}
|
||||
|
||||
|
@ -1119,6 +1123,7 @@ int main(int argc, char *argv[])
|
|||
mbedtls_dhm_calc_secret(&dhm, buf, sizeof(buf), &olen, myrand, NULL));
|
||||
|
||||
mbedtls_dhm_free(&dhm);
|
||||
mbedtls_mpi_free(&P), mbedtls_mpi_free(&G);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue