Intermediate hexify out change
diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function
index c0c987d..4219c9d 100644
--- a/tests/suites/test_suite_pk.function
+++ b/tests/suites/test_suite_pk.function
@@ -70,7 +70,7 @@
*/
/* BEGIN_CASE */
-void pk_utils( int type, int size, int len, char *name )
+void pk_utils( int type, int size, int len, char * name )
{
mbedtls_pk_context pk;
@@ -91,7 +91,7 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_PK_PARSE_C:MBEDTLS_FS_IO */
-void mbedtls_pk_check_pair( char *pub_file, char *prv_file, int ret )
+void mbedtls_pk_check_pair( char * pub_file, char * prv_file, int ret )
{
mbedtls_pk_context pub, prv, alt;
@@ -121,22 +121,19 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_RSA_C */
-void pk_rsa_verify_test_vec( char *message_hex_string, int digest,
- int mod, int radix_N, char *input_N, int radix_E,
- char *input_E, char *result_hex_str, int result )
+void pk_rsa_verify_test_vec( uint8_t * message_str, uint32_t msg_len,
+ int digest, int mod, int radix_N, char * input_N,
+ int radix_E, char * input_E,
+ uint8_t * result_str, uint32_t result_str_len,
+ int result )
{
- unsigned char message_str[1000];
unsigned char hash_result[1000];
- unsigned char result_str[1000];
mbedtls_rsa_context *rsa;
mbedtls_pk_context pk;
- int msg_len;
mbedtls_pk_init( &pk );
- memset( message_str, 0x00, 1000 );
memset( hash_result, 0x00, 1000 );
- memset( result_str, 0x00, 1000 );
TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == 0 );
rsa = mbedtls_pk_rsa( pk );
@@ -145,8 +142,6 @@
TEST_ASSERT( mbedtls_mpi_read_string( &rsa->N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &rsa->E, radix_E, input_E ) == 0 );
- msg_len = unhexify( message_str, message_hex_string );
- unhexify( result_str, result_hex_str );
if( mbedtls_md_info_from_type( digest ) != NULL )
TEST_ASSERT( mbedtls_md( mbedtls_md_info_from_type( digest ), message_str, msg_len, hash_result ) == 0 );
@@ -160,27 +155,23 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_RSA_C */
-void pk_rsa_verify_ext_test_vec( char *message_hex_string, int digest,
- int mod, int radix_N, char *input_N, int radix_E,
- char *input_E, char *result_hex_str,
- int pk_type, int mgf1_hash_id, int salt_len,
- int result )
+void pk_rsa_verify_ext_test_vec( uint8_t * message_str, uint32_t msg_len,
+ int digest, int mod, int radix_N,
+ char * input_N, int radix_E, char * input_E,
+ uint8_t * result_str,
+ uint32_t result_str_len, int pk_type,
+ int mgf1_hash_id, int salt_len, int result )
{
- unsigned char message_str[1000];
unsigned char hash_result[1000];
- unsigned char result_str[1000];
mbedtls_rsa_context *rsa;
mbedtls_pk_context pk;
mbedtls_pk_rsassa_pss_options pss_opts;
void *options;
- int msg_len;
size_t hash_len;
mbedtls_pk_init( &pk );
- memset( message_str, 0x00, 1000 );
memset( hash_result, 0x00, 1000 );
- memset( result_str, 0x00, 1000 );
TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == 0 );
rsa = mbedtls_pk_rsa( pk );
@@ -189,8 +180,6 @@
TEST_ASSERT( mbedtls_mpi_read_string( &rsa->N, radix_N, input_N ) == 0 );
TEST_ASSERT( mbedtls_mpi_read_string( &rsa->E, radix_E, input_E ) == 0 );
- msg_len = unhexify( message_str, message_hex_string );
- unhexify( result_str, result_hex_str );
if( digest != MBEDTLS_MD_NONE )
{
@@ -226,19 +215,15 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_ECDSA_C */
-void pk_ec_test_vec( int type, int id, char *key_str,
- char *hash_str, char * sig_str, int ret )
+void pk_ec_test_vec( int type, int id, uint8_t * key, uint32_t key_len,
+ uint8_t * hash, uint32_t hash_len, uint8_t * sig,
+ uint32_t sig_len, int ret )
{
mbedtls_pk_context pk;
mbedtls_ecp_keypair *eckey;
- unsigned char hash[100], sig[500], key[500];
- size_t hash_len, sig_len, key_len;
mbedtls_pk_init( &pk );
- memset( hash, 0, sizeof( hash ) ); hash_len = unhexify(hash, hash_str);
- memset( sig, 0, sizeof( sig ) ); sig_len = unhexify(sig, sig_str);
- memset( key, 0, sizeof( key ) ); key_len = unhexify(key, key_str);
TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( type ) ) == 0 );
@@ -284,26 +269,20 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_RSA_C */
-void pk_rsa_encrypt_test_vec( char *message_hex, int mod,
- int radix_N, char *input_N,
- int radix_E, char *input_E,
- char *result_hex, int ret )
+void pk_rsa_encrypt_test_vec( uint8_t * message, uint32_t msg_len, int mod,
+ int radix_N, char * input_N, int radix_E,
+ char * input_E, uint8_t * result,
+ uint32_t res_len, int ret )
{
- unsigned char message[1000];
unsigned char output[1000];
- unsigned char result[1000];
- size_t msg_len, olen, res_len;
rnd_pseudo_info rnd_info;
mbedtls_rsa_context *rsa;
mbedtls_pk_context pk;
+ size_t olen;
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
- memset( message, 0, sizeof( message ) );
memset( output, 0, sizeof( output ) );
- memset( result, 0, sizeof( result ) );
- msg_len = unhexify( message, message_hex );
- res_len = unhexify( result, result_hex );
mbedtls_pk_init( &pk );
TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == 0 );
@@ -325,32 +304,25 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_RSA_C */
-void pk_rsa_decrypt_test_vec( char *cipher_hex, 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,
- char *clear_hex, int ret )
+void pk_rsa_decrypt_test_vec( uint8_t * cipher, uint32_t cipher_len, 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, uint8_t * clear,
+ uint32_t clear_len, int ret )
{
- unsigned char clear[1000];
unsigned char output[1000];
- unsigned char cipher[1000];
- size_t clear_len, olen, cipher_len;
rnd_pseudo_info rnd_info;
mbedtls_mpi N, P, Q, E;
mbedtls_rsa_context *rsa;
mbedtls_pk_context pk;
+ size_t olen;
mbedtls_pk_init( &pk );
mbedtls_mpi_init( &N ); mbedtls_mpi_init( &P );
mbedtls_mpi_init( &Q ); mbedtls_mpi_init( &E );
memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
- memset( clear, 0, sizeof( clear ) );
- memset( cipher, 0, sizeof( cipher ) );
- clear_len = unhexify( clear, clear_hex );
- cipher_len = unhexify( cipher, cipher_hex );
/* init pk-rsa context */
TEST_ASSERT( mbedtls_pk_setup( &pk, mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ) ) == 0 );
@@ -453,7 +425,7 @@
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_RSA_C:MBEDTLS_PK_RSA_ALT_SUPPORT */
-void pk_rsa_alt( )
+void pk_rsa_alt( )
{
/*
* An rsa_alt context can only do private operations (decrypt, sign).