commit 15d5de19699fc253beb4910eed17716fd6102a3e
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue Sep 17 11:34:11 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Sep 18 14:35:55 2013 +0200
tree 2bddd60ad834c393ac8204603cf279cc0a4d192e
parent c83e418149d9f410c550d68c6b7ea2e432f5c461

Simplify usage of DHM blinding

programs/pkey/dh_client.c

diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c
index c5c6f75..4e78d6f 100644
--- a/programs/pkey/dh_client.c
+++ b/programs/pkey/dh_client.c
@@ -239,7 +239,8 @@
     fflush( stdout );
 
     n = dhm.len;
-    if( ( ret = dhm_calc_secret( &dhm, buf, &n, NULL, NULL ) ) != 0 )
+    if( ( ret = dhm_calc_secret( &dhm, buf, &n,
+                                 ctr_drbg_random, &ctr_drbg ) ) != 0 )
     {
         printf( " failed\n  ! dhm_calc_secret returned %d\n\n", ret );
         goto exit;

programs/pkey/dh_server.c

diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index 3382307..a657362 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -242,7 +242,8 @@
     printf( "\n  . Shared secret: " );
     fflush( stdout );
 
-    if( ( ret = dhm_calc_secret( &dhm, buf, &n, NULL, NULL ) ) != 0 )
+    if( ( ret = dhm_calc_secret( &dhm, buf, &n,
+                                 ctr_drbg_random, &ctr_drbg ) ) != 0 )
     {
         printf( " failed\n  ! dhm_calc_secret returned %d\n\n", ret );
         goto exit;

programs/test/benchmark.c

diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index 52aecf2..436912a 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -558,7 +558,7 @@
     {
         olen = sizeof( buf );
         ret |= dhm_make_public( &dhm, dhm.len, buf, dhm.len, myrand, NULL );
-        ret |= dhm_calc_secret( &dhm, buf, &olen, NULL, NULL );
+        ret |= dhm_calc_secret( &dhm, buf, &olen, myrand, NULL );
     }
 
     if( ret != 0 )
@@ -617,7 +617,7 @@
     for( i = 1; ! alarmed && ! ret ; i++ )
     {
         olen = sizeof( buf );
-        ret |= dhm_calc_secret( &dhm, buf, &olen, NULL, NULL );
+        ret |= dhm_calc_secret( &dhm, buf, &olen, myrand, NULL );
     }
 
     if( ret != 0 )
@@ -643,7 +643,7 @@
     {
         olen = sizeof( buf );
         ret |= dhm_make_public( &dhm, dhm.len, buf, dhm.len, myrand, NULL );
-        ret |= dhm_calc_secret( &dhm, buf, &olen, NULL, NULL );
+        ret |= dhm_calc_secret( &dhm, buf, &olen, myrand, NULL );
     }
 
     if( ret != 0 )