commit d1eb14ae8a1f87bdf90db1e20784942d220f0b0d
author Gilles Peskine <Gilles.Peskine@arm.com> Tue Mar 30 23:44:22 2021 +0200
committer Ronald Cron <ronald.cron@arm.com> Thu Jun 10 10:35:36 2021 +0200
tree 2200404aceaf63f06fca1a0c2efd79d286c0dc5d
parent 863b83b666cea70ccedee4d1524eab25db34df9e

Test mbedtls_dhm_make_params with different x_size

mbedtls_dhm_make_params() with x_size != size of P is not likely to be
useful, but it's supported, so test it.

Cherry-picked 33ec863570e2448319ae8b44e8e4b52183450e73
Changed mbedtls_test_rnd_pseudo_info type to rnd_pseudo_info

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
Signed-off-by: Ronald Cron <ronald.cron@arm.com>

tests/suites/test_suite_dhm.function

diff --git a/tests/suites/test_suite_dhm.function b/tests/suites/test_suite_dhm.function
index d964f28..7dd9e97 100644
--- a/tests/suites/test_suite_dhm.function
+++ b/tests/suites/test_suite_dhm.function
@@ -169,7 +169,7 @@
 /* END_CASE */
 
 /* BEGIN_CASE */
-void dhm_do_dhm( int radix_P, char *input_P,
+void dhm_do_dhm( int radix_P, char *input_P, int x_size,
                  int radix_G, char *input_G, int result )
 {
     mbedtls_dhm_context ctx_srv;
@@ -183,7 +183,7 @@
     size_t pub_cli_len = 0;
     size_t sec_srv_len;
     size_t sec_cli_len;
-    int x_size, i;
+    int i;
     rnd_pseudo_info rnd_info;
 
     mbedtls_dhm_init( &ctx_srv );
@@ -199,8 +199,7 @@
      */
     TEST_ASSERT( mbedtls_mpi_read_string( &ctx_srv.P, radix_P, input_P ) == 0 );
     TEST_ASSERT( mbedtls_mpi_read_string( &ctx_srv.G, radix_G, input_G ) == 0 );
-    x_size = mbedtls_mpi_size( &ctx_srv.P );
-    pub_cli_len = x_size;
+    pub_cli_len = mbedtls_mpi_size( &ctx_srv.P );
 
     /*
      * First key exchange