Remove radix arg from bignum tests
Cases where radix was explictly declared are removed in most cases,
replaced using script. bignum arguments are represented as hexadecimal
strings. This reduces clutter in test data and makes bit patterns
clearer.
Signed-off-by: Werner Lewis <werner.lewis@arm.com>
diff --git a/tests/suites/test_suite_rsa.function b/tests/suites/test_suite_rsa.function
index 092b492..874709d 100644
--- a/tests/suites/test_suite_rsa.function
+++ b/tests/suites/test_suite_rsa.function
@@ -513,9 +513,9 @@
/* BEGIN_CASE */
void mbedtls_rsa_pkcs1_sign( data_t * message_str, int padding_mode,
- int digest, int mod, int radix_P, char * input_P,
- int radix_Q, char * input_Q, int radix_N,
- char * input_N, int radix_E, char * input_E,
+ int digest, int mod, char * input_P,
+ char * input_Q,
+ char * input_N, char * input_E,
data_t * result_str, int result )
{
unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
@@ -565,8 +565,8 @@
/* BEGIN_CASE */
void mbedtls_rsa_pkcs1_verify( data_t * message_str, int padding_mode,
- int digest, int mod, int radix_N,
- char * input_N, int radix_E, char * input_E,
+ int digest, int mod,
+ char * input_N, char * input_E,
data_t * result_str, int result )
{
unsigned char hash_result[MBEDTLS_MD_MAX_SIZE];
@@ -599,9 +599,9 @@
/* BEGIN_CASE */
void rsa_pkcs1_sign_raw( data_t * hash_result,
- int padding_mode, int mod, int radix_P,
- char * input_P, int radix_Q, char * input_Q,
- int radix_N, char * input_N, int radix_E,
+ int padding_mode, int mod,
+ char * input_P, char * input_Q,
+ char * input_N,
char * input_E, data_t * result_str )
{
unsigned char output[256];
@@ -674,8 +674,8 @@
/* BEGIN_CASE */
void rsa_pkcs1_verify_raw( data_t * hash_result,
- int padding_mode, int mod, int radix_N,
- char * input_N, int radix_E, char * input_E,
+ int padding_mode, int mod,
+ char * input_N, char * input_E,
data_t * result_str, int correct )
{
unsigned char output[256];
@@ -735,8 +735,8 @@
/* BEGIN_CASE */
void mbedtls_rsa_pkcs1_encrypt( data_t * message_str, int padding_mode,
- int mod, int radix_N, char * input_N,
- int radix_E, char * input_E,
+ int mod, char * input_N,
+ char * input_E,
data_t * result_str, int result )
{
unsigned char output[256];
@@ -779,8 +779,8 @@
/* BEGIN_CASE */
void rsa_pkcs1_encrypt_bad_rng( data_t * message_str, int padding_mode,
- int mod, int radix_N, char * input_N,
- int radix_E, char * input_E,
+ int mod, char * input_N,
+ char * input_E,
data_t * result_str, int result )
{
unsigned char output[256];
@@ -819,9 +819,9 @@
/* BEGIN_CASE */
void mbedtls_rsa_pkcs1_decrypt( data_t * message_str, int padding_mode,
- int mod, int radix_P, char * input_P,
- int radix_Q, char * input_Q, int radix_N,
- char * input_N, int radix_E, char * input_E,
+ int mod, char * input_P,
+ char * input_Q,
+ char * input_N, char * input_E,
int max_output, data_t * result_str,
int result )
{
@@ -872,8 +872,8 @@
/* END_CASE */
/* BEGIN_CASE */
-void mbedtls_rsa_public( data_t * message_str, int mod, int radix_N,
- char * input_N, int radix_E, char * input_E,
+void mbedtls_rsa_public( data_t * message_str, int mod,
+ char * input_N, char * input_E,
data_t * result_str, int result )
{
unsigned char output[256];
@@ -928,9 +928,9 @@
/* END_CASE */
/* BEGIN_CASE */
-void mbedtls_rsa_private( data_t * message_str, int mod, int radix_P,
- char * input_P, int radix_Q, char * input_Q,
- int radix_N, char * input_N, int radix_E,
+void mbedtls_rsa_private( data_t * message_str, int mod,
+ char * input_P, char * input_Q,
+ char * input_N,
char * input_E, data_t * result_str,
int result )
{
@@ -1014,7 +1014,7 @@
/* END_CASE */
/* BEGIN_CASE */
-void mbedtls_rsa_check_pubkey( int radix_N, char * input_N, int radix_E,
+void mbedtls_rsa_check_pubkey( char * input_N,
char * input_E, int result )
{
mbedtls_rsa_context ctx;
@@ -1042,12 +1042,12 @@
/* END_CASE */
/* BEGIN_CASE */
-void mbedtls_rsa_check_privkey( int mod, int radix_P, char * input_P,
- int radix_Q, char * input_Q, int radix_N,
- char * input_N, int radix_E, char * input_E,
- int radix_D, char * input_D, int radix_DP,
- char * input_DP, int radix_DQ,
- char * input_DQ, int radix_QP,
+void mbedtls_rsa_check_privkey( int mod, char * input_P,
+ char * input_Q,
+ char * input_N, char * input_E,
+ char * input_D,
+ char * input_DP,
+ char * input_DQ,
char * input_QP, int result )
{
mbedtls_rsa_context ctx;
@@ -1102,13 +1102,13 @@
/* END_CASE */
/* BEGIN_CASE */
-void rsa_check_pubpriv( int mod, int radix_Npub, char * input_Npub,
- int radix_Epub, char * input_Epub, int radix_P,
- char * input_P, int radix_Q, char * input_Q,
- int radix_N, char * input_N, int radix_E,
- char * input_E, int radix_D, char * input_D,
- int radix_DP, char * input_DP, int radix_DQ,
- char * input_DQ, int radix_QP, char * input_QP,
+void rsa_check_pubpriv( int mod, char * input_Npub,
+ char * input_Epub,
+ char * input_P, char * input_Q,
+ char * input_N,
+ char * input_E, char * input_D,
+ char * input_DP,
+ char * input_DQ, char * input_QP,
int result )
{
mbedtls_rsa_context pub, prv;
@@ -1206,11 +1206,11 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CTR_DRBG_C:MBEDTLS_ENTROPY_C */
-void mbedtls_rsa_deduce_primes( int radix_N, char *input_N,
- int radix_D, char *input_D,
- int radix_E, char *input_E,
- int radix_P, char *output_P,
- int radix_Q, char *output_Q,
+void mbedtls_rsa_deduce_primes( char *input_N,
+ char *input_D,
+ char *input_E,
+ char *output_P,
+ char *output_Q,
int corrupt, int result )
{
mbedtls_mpi N, P, Pp, Q, Qp, D, E;
@@ -1248,10 +1248,10 @@
/* END_CASE */
/* BEGIN_CASE */
-void mbedtls_rsa_deduce_private_exponent( int radix_P, char *input_P,
- int radix_Q, char *input_Q,
- int radix_E, char *input_E,
- int radix_D, char *output_D,
+void mbedtls_rsa_deduce_private_exponent( char *input_P,
+ char *input_Q,
+ char *input_E,
+ char *output_D,
int corrupt, int result )
{
mbedtls_mpi P, Q, D, Dp, E, R, Rp;
@@ -1307,11 +1307,11 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CTR_DRBG_C:MBEDTLS_ENTROPY_C:ENTROPY_HAVE_STRONG */
-void mbedtls_rsa_import( int radix_N, char *input_N,
- int radix_P, char *input_P,
- int radix_Q, char *input_Q,
- int radix_D, char *input_D,
- int radix_E, char *input_E,
+void mbedtls_rsa_import( char *input_N,
+ char *input_P,
+ char *input_Q,
+ char *input_D,
+ char *input_E,
int successive,
int is_priv,
int res_check,
@@ -1456,11 +1456,11 @@
/* END_CASE */
/* BEGIN_CASE */
-void mbedtls_rsa_export( int radix_N, char *input_N,
- int radix_P, char *input_P,
- int radix_Q, char *input_Q,
- int radix_D, char *input_D,
- int radix_E, char *input_E,
+void mbedtls_rsa_export( char *input_N,
+ char *input_P,
+ char *input_Q,
+ char *input_D,
+ char *input_E,
int is_priv,
int successive )
{
@@ -1580,11 +1580,11 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_ENTROPY_C:ENTROPY_HAVE_STRONG:MBEDTLS_ENTROPY_C:MBEDTLS_CTR_DRBG_C */
-void mbedtls_rsa_validate_params( int radix_N, char *input_N,
- int radix_P, char *input_P,
- int radix_Q, char *input_Q,
- int radix_D, char *input_D,
- int radix_E, char *input_E,
+void mbedtls_rsa_validate_params( char *input_N,
+ char *input_P,
+ char *input_Q,
+ char *input_D,
+ char *input_E,
int prng, int result )
{
/* Original MPI's with which we set up the RSA context */