From cb9ba0f43c3379cedc24b0ee44c3a8ca8922614b Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Tue, 28 May 2019 13:58:14 +0100 Subject: [PATCH] Use consistent spelling of 'serialise/serialize' in SSL test suite --- tests/suites/test_suite_ssl.data | 14 +++++----- tests/suites/test_suite_ssl.function | 38 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/suites/test_suite_ssl.data b/tests/suites/test_suite_ssl.data index a1a62d03f..819162943 100644 --- a/tests/suites/test_suite_ssl.data +++ b/tests/suites/test_suite_ssl.data @@ -59,16 +59,16 @@ SSL SET_HOSTNAME memory leak: call ssl_set_hostname twice ssl_set_hostname_twice:"server0":"server1" SSL session serialization: Wrong major version -ssl_session_serialize_version_check:1:0:0:0 +ssl_session_serialise_version_check:1:0:0:0 -SSL session serialization: Wrong minor version -ssl_session_serialize_version_check:1:0:0:0 +SSL session serialisation: Wrong minor version +ssl_session_serialise_version_check:0:1:0:0 -SSL session serialization: Wrong patch version -ssl_session_serialize_version_check:1:0:0:0 +SSL session serialisation: Wrong patch version +ssl_session_serialise_version_check:0:0:1:0 -SSL session serialization: Wrong config -ssl_session_serialize_version_check:1:0:0:0 +SSL session serialisation: Wrong config +ssl_session_serialise_version_check:0:0:0:1 Record crypt, AES-128-CBC, 1.2, SHA-384 depends_on:MBEDTLS_CIPHER_MODE_CBC:MBEDTLS_AES_C:MBEDTLS_SSL_PROTO_TLS1_2:MBEDTLS_SHA512_C diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function index a776fdf91..64a534c33 100644 --- a/tests/suites/test_suite_ssl.function +++ b/tests/suites/test_suite_ssl.function @@ -852,52 +852,52 @@ exit: } /* END_CASE */ -/* BEGIN_CASE depends_on:!MBEDTLS_SSL_SERIALIZED_STRUCTURES_LOCAL_ONLY */ -void ssl_session_serialize_version_check( int corrupt_major, +/* BEGIN_CASE depends_on */ +void ssl_session_serialise_version_check( int corrupt_major, int corrupt_minor, int corrupt_patch, int corrupt_config ) { - unsigned char serialized_session[ 2048 ]; - size_t serialized_session_len; + unsigned char serialised_session[ 2048 ]; + size_t serialised_session_len; mbedtls_ssl_session session; mbedtls_ssl_session_init( &session ); - /* Infer length of serialized session. */ + /* Infer length of serialised session. */ TEST_ASSERT( mbedtls_ssl_session_save( &session, - serialized_session, - sizeof( serialized_session ), - &serialized_session_len ) == 0 ); + serialised_session, + sizeof( serialised_session ), + &serialised_session_len ) == 0 ); mbedtls_ssl_session_free( &session ); /* Without any modification, we should be able to successfully - * de-serialize the session - double-check that. */ + * de-serialise the session - double-check that. */ TEST_ASSERT( mbedtls_ssl_session_load( &session, - serialized_session, - serialized_session_len ) == 0 ); + serialised_session, + serialised_session_len ) == 0 ); mbedtls_ssl_session_free( &session ); if( corrupt_major ) - serialized_session[0] ^= (uint8_t) 0x1; + serialised_session[0] ^= (uint8_t) 0x1; if( corrupt_minor ) - serialized_session[1] ^= (uint8_t) 0x1; + serialised_session[1] ^= (uint8_t) 0x1; if( corrupt_patch ) - serialized_session[2] ^= (uint8_t) 0x1; + serialised_session[2] ^= (uint8_t) 0x1; if( corrupt_config ) { - serialized_session[3] ^= (uint8_t) 0x1; - serialized_session[4] ^= (uint8_t) 0x1; - serialized_session[5] ^= (uint8_t) 0x1; + serialised_session[3] ^= (uint8_t) 0x1; + serialised_session[4] ^= (uint8_t) 0x1; + serialised_session[5] ^= (uint8_t) 0x1; } TEST_ASSERT( mbedtls_ssl_session_load( &session, - serialized_session, - serialized_session_len ) == + serialised_session, + serialised_session_len ) == MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); } /* END_CASE */