mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-26 00:35:40 +01:00
825ebd483f
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
131 lines
3.2 KiB
Plaintext
131 lines
3.2 KiB
Plaintext
/* BEGIN_HEADER */
|
|
#include "mbedtls/asn1write.h"
|
|
|
|
#define GUARD_LEN 4
|
|
#define GUARD_VAL 0x2a
|
|
/* END_HEADER */
|
|
|
|
/* BEGIN_DEPENDENCIES
|
|
* depends_on:MBEDTLS_ASN1_WRITE_C
|
|
* END_DEPENDENCIES
|
|
*/
|
|
|
|
/* BEGIN_CASE */
|
|
void mbedtls_asn1_write_octet_string( data_t * str, data_t * asn1,
|
|
int buf_len, int result )
|
|
{
|
|
int ret;
|
|
unsigned char buf[150];
|
|
size_t i;
|
|
unsigned char *p;
|
|
|
|
memset( buf, GUARD_VAL, sizeof( buf ) );
|
|
|
|
|
|
p = buf + GUARD_LEN + buf_len;
|
|
|
|
ret = mbedtls_asn1_write_octet_string( &p, buf + GUARD_LEN, str->x, str->len );
|
|
|
|
/* Check for buffer overwrite on both sides */
|
|
for( i = 0; i < GUARD_LEN; i++ )
|
|
{
|
|
TEST_ASSERT( buf[i] == GUARD_VAL );
|
|
TEST_ASSERT( buf[GUARD_LEN + buf_len + i] == GUARD_VAL );
|
|
}
|
|
|
|
if( result >= 0 )
|
|
{
|
|
TEST_ASSERT( (size_t) ret == asn1->len );
|
|
TEST_ASSERT( p + asn1->len == buf + GUARD_LEN + buf_len );
|
|
|
|
TEST_ASSERT( memcmp( p, asn1->x, asn1->len ) == 0 );
|
|
}
|
|
}
|
|
/* END_CASE */
|
|
|
|
/* BEGIN_CASE */
|
|
void mbedtls_asn1_write_ia5_string( char * str, data_t * asn1,
|
|
int buf_len, int result )
|
|
{
|
|
int ret;
|
|
unsigned char buf[150];
|
|
size_t str_len;
|
|
size_t i;
|
|
unsigned char *p;
|
|
|
|
memset( buf, GUARD_VAL, sizeof( buf ) );
|
|
|
|
str_len = strlen( str );
|
|
|
|
p = buf + GUARD_LEN + buf_len;
|
|
|
|
ret = mbedtls_asn1_write_ia5_string( &p, buf + GUARD_LEN, str, str_len );
|
|
|
|
/* Check for buffer overwrite on both sides */
|
|
for( i = 0; i < GUARD_LEN; i++ )
|
|
{
|
|
TEST_ASSERT( buf[i] == GUARD_VAL );
|
|
TEST_ASSERT( buf[GUARD_LEN + buf_len + i] == GUARD_VAL );
|
|
}
|
|
|
|
if( result >= 0 )
|
|
{
|
|
TEST_ASSERT( (size_t) ret == asn1->len );
|
|
TEST_ASSERT( p + asn1->len == buf + GUARD_LEN + buf_len );
|
|
|
|
TEST_ASSERT( memcmp( p, asn1->x, asn1->len ) == 0 );
|
|
}
|
|
}
|
|
/* END_CASE */
|
|
|
|
/* BEGIN_CASE depends_on:MBEDTLS_ASN1_PARSE_C */
|
|
void mbedtls_asn1_write_len( int len, data_t * asn1, int buf_len,
|
|
int result )
|
|
{
|
|
int ret;
|
|
unsigned char buf[150];
|
|
unsigned char *p;
|
|
size_t i;
|
|
size_t read_len;
|
|
|
|
memset( buf, GUARD_VAL, sizeof( buf ) );
|
|
|
|
p = buf + GUARD_LEN + buf_len;
|
|
|
|
ret = mbedtls_asn1_write_len( &p, buf + GUARD_LEN, (size_t) len );
|
|
|
|
TEST_ASSERT( ret == result );
|
|
|
|
/* Check for buffer overwrite on both sides */
|
|
for( i = 0; i < GUARD_LEN; i++ )
|
|
{
|
|
TEST_ASSERT( buf[i] == GUARD_VAL );
|
|
TEST_ASSERT( buf[GUARD_LEN + buf_len + i] == GUARD_VAL );
|
|
}
|
|
|
|
if( result >= 0 )
|
|
{
|
|
TEST_ASSERT( p + asn1->len == buf + GUARD_LEN + buf_len );
|
|
|
|
TEST_ASSERT( memcmp( p, asn1->x, asn1->len ) == 0 );
|
|
|
|
/* Read back with mbedtls_asn1_get_len() to check */
|
|
ret = mbedtls_asn1_get_len( &p, buf + GUARD_LEN + buf_len, &read_len );
|
|
|
|
if( len == 0 )
|
|
{
|
|
TEST_ASSERT( ret == 0 );
|
|
}
|
|
else
|
|
{
|
|
/* Return will be MBEDTLS_ERR_ASN1_OUT_OF_DATA because the rest of
|
|
* the buffer is missing
|
|
*/
|
|
TEST_ASSERT( ret == MBEDTLS_ERR_ASN1_OUT_OF_DATA );
|
|
}
|
|
TEST_ASSERT( read_len == (size_t) len );
|
|
TEST_ASSERT( p == buf + GUARD_LEN + buf_len );
|
|
}
|
|
}
|
|
/* END_CASE */
|