yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 13:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/pr/1963' into development

Browse source
This commit is contained in:
Simon Butcher 2018-08-28 10:21:06 +01:00
parent badeb07872 6b13afe1a5
commit 6f032a60c9
2 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
tests/suites/test_suite_nist_kw.data
View file

@ -69,6 +69,27 @@ nist_kw_ciphertext_lengths:32:16:MBEDTLS_KW_MODE_KW:MBEDTLS_ERR_CIPHER_BAD_INPUT
NIST KW lengths #16 KWP unwrapping output buffer too short
nist_kw_ciphertext_lengths:24:12:MBEDTLS_KW_MODE_KWP:MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA
NIST KW lengths #17 KW plaintext NULL (2 to 2^54 - 1 semiblocks)
nist_kw_plaintext_lengths:0:8:MBEDTLS_KW_MODE_KW:MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA
NIST KW lengths #18 KW wrapping output NULL
nist_kw_plaintext_lengths:8:0:MBEDTLS_KW_MODE_KW:MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA
NIST KW lengths #19 KWP wrapping output NULL
nist_kw_plaintext_lengths:8:0:MBEDTLS_KW_MODE_KWP:MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA
NIST KW lengths #20 KW ciphertext NULL
nist_kw_ciphertext_lengths:0:8:MBEDTLS_KW_MODE_KW:MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA
NIST KW lengths #21 KWP ciphertext NULL
nist_kw_ciphertext_lengths:0:8:MBEDTLS_KW_MODE_KWP:MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA
NIST KW lengths #15 KW unwrapping output NULL
nist_kw_ciphertext_lengths:32:0:MBEDTLS_KW_MODE_KW:MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA
NIST KW lengths #16 KWP unwrapping output NULL
nist_kw_ciphertext_lengths:24:0:MBEDTLS_KW_MODE_KWP:MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA
NIST KW wrap AES-128 CAVS 17.4 PLAINTEXT LENGTH = 128 count 7
depends_on:MBEDTLS_AES_C
mbedtls_nist_kw_wrap:MBEDTLS_CIPHER_ID_AES:MBEDTLS_KW_MODE_KW:"095e293f31e317ba6861114b95c90792":"64349d506ae85ecd84459c7a5c423f55":"97de4425572274bd7fb2d6688d5afd4454d992348d42a643"

32
tests/suites/test_suite_nist_kw.function
View file

@ -158,19 +158,17 @@ void nist_kw_plaintext_lengths( int in_len, int out_len, int mode, int res )
memset( key, 0, sizeof( key ) );
if (in_len == 0)
{
/* mbedtls_calloc can return NULL for zero-length buffers. Make sure we
* always have a plaintext buffer, even if the length is 0. */
plaintext = mbedtls_calloc( 1, 1 );
}
else
if( in_len != 0 )
{
plaintext = mbedtls_calloc( 1, in_len );
TEST_ASSERT( plaintext != NULL );
}
if( out_len != 0 )
{
ciphertext = mbedtls_calloc( 1, output_len );
TEST_ASSERT( ciphertext != NULL );
}
TEST_ASSERT( plaintext != NULL );
ciphertext = mbedtls_calloc( 1, output_len );
TEST_ASSERT( ciphertext != NULL );
memset( plaintext, 0, in_len );
memset( ciphertext, 0, output_len );
@ -216,10 +214,16 @@ void nist_kw_ciphertext_lengths( int in_len, int out_len, int mode, int res )
memset( key, 0, sizeof( key ) );
plaintext = mbedtls_calloc( 1, output_len );
TEST_ASSERT( plaintext != NULL );
ciphertext = mbedtls_calloc( 1, in_len );
TEST_ASSERT( ciphertext != NULL );
if( out_len != 0 )
{
plaintext = mbedtls_calloc( 1, output_len );
TEST_ASSERT( plaintext != NULL );
}
if( in_len != 0 )
{
ciphertext = mbedtls_calloc( 1, in_len );
TEST_ASSERT( ciphertext != NULL );
}
memset( plaintext, 0, output_len );
memset( ciphertext, 0, in_len );