mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-30 10:04:14 +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>
165 lines
4.0 KiB
Plaintext
165 lines
4.0 KiB
Plaintext
/* BEGIN_HEADER */
|
|
#include "mbedtls/pk.h"
|
|
#include "mbedtls/pem.h"
|
|
#include "mbedtls/oid.h"
|
|
/* END_HEADER */
|
|
|
|
/* BEGIN_DEPENDENCIES
|
|
* depends_on:MBEDTLS_PK_PARSE_C:MBEDTLS_BIGNUM_C
|
|
* END_DEPENDENCIES
|
|
*/
|
|
|
|
/* BEGIN_CASE depends_on:MBEDTLS_RSA_C:MBEDTLS_FS_IO */
|
|
void pk_parse_keyfile_rsa( char * key_file, char * password, int result )
|
|
{
|
|
mbedtls_pk_context ctx;
|
|
int res;
|
|
char *pwd = password;
|
|
|
|
mbedtls_pk_init( &ctx );
|
|
|
|
if( strcmp( pwd, "NULL" ) == 0 )
|
|
pwd = NULL;
|
|
|
|
res = mbedtls_pk_parse_keyfile( &ctx, key_file, pwd );
|
|
|
|
TEST_ASSERT( res == result );
|
|
|
|
if( res == 0 )
|
|
{
|
|
mbedtls_rsa_context *rsa;
|
|
TEST_ASSERT( mbedtls_pk_can_do( &ctx, MBEDTLS_PK_RSA ) );
|
|
rsa = mbedtls_pk_rsa( ctx );
|
|
TEST_ASSERT( mbedtls_rsa_check_privkey( rsa ) == 0 );
|
|
}
|
|
|
|
exit:
|
|
mbedtls_pk_free( &ctx );
|
|
}
|
|
/* END_CASE */
|
|
|
|
/* BEGIN_CASE depends_on:MBEDTLS_RSA_C:MBEDTLS_FS_IO */
|
|
void pk_parse_public_keyfile_rsa( char * key_file, int result )
|
|
{
|
|
mbedtls_pk_context ctx;
|
|
int res;
|
|
|
|
mbedtls_pk_init( &ctx );
|
|
|
|
res = mbedtls_pk_parse_public_keyfile( &ctx, key_file );
|
|
|
|
TEST_ASSERT( res == result );
|
|
|
|
if( res == 0 )
|
|
{
|
|
mbedtls_rsa_context *rsa;
|
|
TEST_ASSERT( mbedtls_pk_can_do( &ctx, MBEDTLS_PK_RSA ) );
|
|
rsa = mbedtls_pk_rsa( ctx );
|
|
TEST_ASSERT( mbedtls_rsa_check_pubkey( rsa ) == 0 );
|
|
}
|
|
|
|
exit:
|
|
mbedtls_pk_free( &ctx );
|
|
}
|
|
/* END_CASE */
|
|
|
|
/* BEGIN_CASE depends_on:MBEDTLS_FS_IO */
|
|
void pk_parse_public_keyfile_ec( char * key_file, int result )
|
|
{
|
|
#if !defined(MBEDTLS_ECP_C) && !defined(MBEDTLS_USE_TINYCRYPT)
|
|
((void) key_file);
|
|
((void) result);
|
|
#else
|
|
mbedtls_pk_context ctx;
|
|
int res;
|
|
|
|
mbedtls_pk_init( &ctx );
|
|
|
|
res = mbedtls_pk_parse_public_keyfile( &ctx, key_file );
|
|
|
|
TEST_ASSERT( res == result );
|
|
|
|
if( res == 0 )
|
|
{
|
|
#if !defined(MBEDTLS_USE_TINYCRYPT)
|
|
mbedtls_ecp_keypair *eckey;
|
|
#else
|
|
mbedtls_uecc_keypair *uecckey;
|
|
#endif
|
|
TEST_ASSERT( mbedtls_pk_can_do( &ctx, MBEDTLS_PK_ECKEY ) );
|
|
|
|
#if !defined(MBEDTLS_USE_TINYCRYPT)
|
|
eckey = mbedtls_pk_ec( ctx );
|
|
TEST_ASSERT( mbedtls_ecp_check_pubkey( &eckey->grp, &eckey->Q ) == 0 );
|
|
#else
|
|
uecckey = mbedtls_pk_uecc( ctx );
|
|
TEST_ASSERT( uECC_valid_public_key( uecckey->public_key ) == 0 );
|
|
#endif /* MBEDTLS_USE_TINYCRYPT */
|
|
}
|
|
|
|
exit:
|
|
mbedtls_pk_free( &ctx );
|
|
#endif /* !MBEDTLS_ECP_C && !MBEDTLS_USE_TINYCRYPT */
|
|
}
|
|
/* END_CASE */
|
|
|
|
/* BEGIN_CASE depends_on:MBEDTLS_FS_IO */
|
|
void pk_parse_keyfile_ec( char * key_file, char * password, int result )
|
|
{
|
|
#if !defined(MBEDTLS_ECP_C) && !defined(MBEDTLS_USE_TINYCRYPT)
|
|
((void) key_file);
|
|
((void) password);
|
|
((void) result);
|
|
#else
|
|
mbedtls_pk_context ctx;
|
|
int res;
|
|
|
|
mbedtls_pk_init( &ctx );
|
|
|
|
res = mbedtls_pk_parse_keyfile( &ctx, key_file, password );
|
|
|
|
TEST_ASSERT( res == result );
|
|
|
|
if( res == 0 )
|
|
{
|
|
#if !defined(MBEDTLS_USE_TINYCRYPT)
|
|
mbedtls_ecp_keypair *eckey;
|
|
#else
|
|
mbedtls_uecc_keypair *uecckey;
|
|
unsigned char tmp_pubkey[ 2 * NUM_ECC_BYTES ];
|
|
#endif
|
|
TEST_ASSERT( mbedtls_pk_can_do( &ctx, MBEDTLS_PK_ECKEY ) );
|
|
|
|
#if !defined(MBEDTLS_USE_TINYCRYPT)
|
|
eckey = mbedtls_pk_ec( ctx );
|
|
TEST_ASSERT( mbedtls_ecp_check_privkey( &eckey->grp, &eckey->d ) == 0 );
|
|
#else
|
|
uecckey = mbedtls_pk_uecc( ctx );
|
|
TEST_ASSERT( uECC_valid_public_key( uecckey->public_key ) == 0 );
|
|
TEST_ASSERT( uECC_compute_public_key( uecckey->private_key,
|
|
tmp_pubkey ) == UECC_SUCCESS );
|
|
TEST_ASSERT( memcmp( tmp_pubkey, uecckey->public_key,
|
|
sizeof( tmp_pubkey ) ) == 0 );
|
|
#endif /* MBEDTLS_USE_TINYCRYPT */
|
|
}
|
|
|
|
exit:
|
|
mbedtls_pk_free( &ctx );
|
|
#endif /* !MBEDTLS_ECP_C && !MBEDTLS_USE_TINYCRYPT */
|
|
}
|
|
/* END_CASE */
|
|
|
|
/* BEGIN_CASE */
|
|
void pk_parse_key( data_t * buf, int result )
|
|
{
|
|
mbedtls_pk_context pk;
|
|
|
|
mbedtls_pk_init( &pk );
|
|
|
|
TEST_ASSERT( mbedtls_pk_parse_key( &pk, buf->x, buf->len, NULL, 0 ) == result );
|
|
|
|
exit:
|
|
mbedtls_pk_free( &pk );
|
|
}
|
|
/* END_CASE */
|