- Updated to new rsa_init, rsa_gen_key prototypes
diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c
index bcf4df5..8b9ced4 100644
--- a/programs/pkey/dh_client.c
+++ b/programs/pkey/dh_client.c
@@ -81,7 +81,7 @@
goto exit;
}
- rsa_init( &rsa, RSA_PKCS_V15, 0, NULL, NULL );
+ rsa_init( &rsa, RSA_PKCS_V15, 0 );
if( ( ret = mpi_read_file( &rsa.N, 16, f ) ) != 0 ||
( ret = mpi_read_file( &rsa.E, 16, f ) ) != 0 )
diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index cac46e6..aa89fcf 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -82,7 +82,7 @@
goto exit;
}
- rsa_init( &rsa, RSA_PKCS_V15, 0, NULL, NULL );
+ rsa_init( &rsa, RSA_PKCS_V15, 0 );
if( ( ret = mpi_read_file( &rsa.N , 16, f ) ) != 0 ||
( ret = mpi_read_file( &rsa.E , 16, f ) ) != 0 ||
diff --git a/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c
index c426628..1a817ab 100644
--- a/programs/pkey/rsa_genkey.c
+++ b/programs/pkey/rsa_genkey.c
@@ -53,9 +53,9 @@
printf( " ok\n . Generating the RSA key [ %d-bit ]...", KEY_SIZE );
fflush( stdout );
- rsa_init( &rsa, RSA_PKCS_V15, 0, havege_rand, &hs );
+ rsa_init( &rsa, RSA_PKCS_V15, 0 );
- if( ( ret = rsa_gen_key( &rsa, KEY_SIZE, EXPONENT ) ) != 0 )
+ if( ( ret = rsa_gen_key( &rsa, havege_rand, &hs, KEY_SIZE, EXPONENT ) ) != 0 )
{
printf( " failed\n ! rsa_gen_key returned %d\n\n", ret );
goto exit;
diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c
index e224d4b..1745c96 100644
--- a/programs/pkey/rsa_sign.c
+++ b/programs/pkey/rsa_sign.c
@@ -65,7 +65,7 @@
goto exit;
}
- rsa_init( &rsa, RSA_PKCS_V15, 0, NULL, NULL );
+ rsa_init( &rsa, RSA_PKCS_V15, 0 );
if( ( ret = mpi_read_file( &rsa.N , 16, f ) ) != 0 ||
( ret = mpi_read_file( &rsa.E , 16, f ) ) != 0 ||
diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c
index b3a7eab..84cb84e 100644
--- a/programs/pkey/rsa_verify.c
+++ b/programs/pkey/rsa_verify.c
@@ -63,7 +63,7 @@
goto exit;
}
- rsa_init( &rsa, RSA_PKCS_V15, 0, NULL, NULL );
+ rsa_init( &rsa, RSA_PKCS_V15, 0 );
if( ( ret = mpi_read_file( &rsa.N, 16, f ) ) != 0 ||
( ret = mpi_read_file( &rsa.E, 16, f ) ) != 0 )
diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index b0aba11..95cdc1b 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -264,8 +264,8 @@
#endif
#if defined(POLARSSL_RSA_C)
- rsa_init( &rsa, RSA_PKCS_V15, 0, myrand, NULL );
- rsa_gen_key( &rsa, 1024, 65537 );
+ rsa_init( &rsa, RSA_PKCS_V15, 0 );
+ rsa_gen_key( &rsa, myrand, NULL, 1024, 65537 );
printf( " RSA-1024 : " );
fflush( stdout );
@@ -293,8 +293,8 @@
rsa_free( &rsa );
- rsa_init( &rsa, RSA_PKCS_V15, 0, myrand, NULL );
- rsa_gen_key( &rsa, 2048, 65537 );
+ rsa_init( &rsa, RSA_PKCS_V15, 0 );
+ rsa_gen_key( &rsa, myrand, NULL, 2048, 65537 );
printf( " RSA-2048 : " );
fflush( stdout );
@@ -322,8 +322,8 @@
rsa_free( &rsa );
- rsa_init( &rsa, RSA_PKCS_V15, 0, myrand, NULL );
- rsa_gen_key( &rsa, 4096, 65537 );
+ rsa_init( &rsa, RSA_PKCS_V15, 0 );
+ rsa_gen_key( &rsa, myrand, NULL, 4096, 65537 );
printf( " RSA-4096 : " );
fflush( stdout );
diff --git a/tests/suites/test_suite_rsa.function b/tests/suites/test_suite_rsa.function
index 9595e8a..4b94274 100644
--- a/tests/suites/test_suite_rsa.function
+++ b/tests/suites/test_suite_rsa.function
@@ -516,7 +516,7 @@
havege_init( &hs );
rsa_init( &ctx, 0, 0 );
- TEST_ASSERT( rsa_gen_key( &ctx, &havege_rand, &hs, {nrbits}, {exponent} ) == {result} );
+ TEST_ASSERT( rsa_gen_key( &ctx, havege_rand, &hs, {nrbits}, {exponent} ) == {result} );
if( {result} == 0 )
{
TEST_ASSERT( rsa_check_privkey( &ctx ) == 0 );