early-access version 1503
This commit is contained in:
@@ -8,38 +8,24 @@
|
||||
*/
|
||||
|
||||
/* BEGIN_CASE */
|
||||
void pbkdf2_hmac( int hash, char *hex_password_string,
|
||||
char *hex_salt_string, int it_cnt, int key_len,
|
||||
char *result_key_string )
|
||||
void pbkdf2_hmac( int hash, data_t * pw_str, data_t * salt_str,
|
||||
int it_cnt, int key_len, data_t * result_key_string )
|
||||
{
|
||||
unsigned char pw_str[100];
|
||||
unsigned char salt_str[100];
|
||||
unsigned char dst_str[200];
|
||||
|
||||
mbedtls_md_context_t ctx;
|
||||
const mbedtls_md_info_t *info;
|
||||
|
||||
int pw_len, salt_len;
|
||||
unsigned char key[100];
|
||||
|
||||
mbedtls_md_init( &ctx );
|
||||
|
||||
memset(pw_str, 0x00, sizeof(pw_str));
|
||||
memset(salt_str, 0x00, sizeof(salt_str));
|
||||
memset(dst_str, 0x00, sizeof(dst_str));
|
||||
|
||||
pw_len = unhexify( pw_str, hex_password_string );
|
||||
salt_len = unhexify( salt_str, hex_salt_string );
|
||||
|
||||
|
||||
info = mbedtls_md_info_from_type( hash );
|
||||
TEST_ASSERT( info != NULL );
|
||||
TEST_ASSERT( mbedtls_md_setup( &ctx, info, 1 ) == 0 );
|
||||
TEST_ASSERT( mbedtls_pkcs5_pbkdf2_hmac( &ctx, pw_str, pw_len, salt_str, salt_len,
|
||||
TEST_ASSERT( mbedtls_pkcs5_pbkdf2_hmac( &ctx, pw_str->x, pw_str->len, salt_str->x, salt_str->len,
|
||||
it_cnt, key_len, key ) == 0 );
|
||||
|
||||
hexify( dst_str, key, key_len );
|
||||
TEST_ASSERT( strcmp( (char *) dst_str, result_key_string ) == 0 );
|
||||
TEST_ASSERT( mbedtls_test_hexcmp( key, result_key_string->x,
|
||||
key_len, result_key_string->len ) == 0 );
|
||||
|
||||
exit:
|
||||
mbedtls_md_free( &ctx );
|
||||
@@ -47,40 +33,33 @@ exit:
|
||||
/* END_CASE */
|
||||
|
||||
/* BEGIN_CASE depends_on:MBEDTLS_ASN1_PARSE_C */
|
||||
void mbedtls_pkcs5_pbes2( int params_tag, char *params_hex, char *pw_hex,
|
||||
char *data_hex, int ref_ret, char *ref_out_hex )
|
||||
void mbedtls_pkcs5_pbes2( int params_tag, data_t *params_hex, data_t *pw,
|
||||
data_t *data, int ref_ret, data_t *ref_out )
|
||||
{
|
||||
int my_ret;
|
||||
mbedtls_asn1_buf params;
|
||||
unsigned char *my_out = NULL, *ref_out = NULL, *data = NULL, *pw = NULL;
|
||||
size_t ref_out_len, data_len, pw_len;
|
||||
unsigned char *my_out = NULL;
|
||||
|
||||
params.tag = params_tag;
|
||||
params.p = unhexify_alloc( params_hex, ¶ms.len );
|
||||
params.p = params_hex->x;
|
||||
params.len = params_hex->len;
|
||||
|
||||
data = unhexify_alloc( data_hex, &data_len );
|
||||
pw = unhexify_alloc( pw_hex, &pw_len );
|
||||
ref_out = unhexify_alloc( ref_out_hex, &ref_out_len );
|
||||
my_out = zero_alloc( ref_out_len );
|
||||
my_out = zero_alloc( ref_out->len );
|
||||
|
||||
my_ret = mbedtls_pkcs5_pbes2( ¶ms, MBEDTLS_PKCS5_DECRYPT,
|
||||
pw, pw_len, data, data_len, my_out );
|
||||
pw->x, pw->len, data->x, data->len, my_out );
|
||||
TEST_ASSERT( my_ret == ref_ret );
|
||||
|
||||
if( ref_ret == 0 )
|
||||
TEST_ASSERT( memcmp( my_out, ref_out, ref_out_len ) == 0 );
|
||||
TEST_ASSERT( memcmp( my_out, ref_out->x, ref_out->len ) == 0 );
|
||||
|
||||
exit:
|
||||
mbedtls_free( params.p );
|
||||
mbedtls_free( data );
|
||||
mbedtls_free( pw );
|
||||
mbedtls_free( ref_out );
|
||||
mbedtls_free( my_out );
|
||||
}
|
||||
/* END_CASE */
|
||||
|
||||
/* BEGIN_CASE depends_on:MBEDTLS_SELF_TEST */
|
||||
void pkcs5_selftest( )
|
||||
void pkcs5_selftest( )
|
||||
{
|
||||
TEST_ASSERT( mbedtls_pkcs5_self_test( 1 ) == 0 );
|
||||
}
|
||||
|
Reference in New Issue
Block a user