yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-07 00:29:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declare mbedtls_pk_info_t through macro

Browse source 
New macro MBEDTLS_PK_OPAQUE_INFO_1 to initialize mbedtls_pk_info_t structures.
Document that this macro must be used in engine implementations for forward
compatibility. Use this macro rather than accessing the structure directly
in tests and in the sample engine to set a good example.
This commit is contained in:
Andrzej Kurek 2018-01-22 07:14:34 -05:00
parent 8b6aaca7e5
commit e735310551
2 changed files with 93 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
include/mbedtls/pk_info.h
View file

@ -71,6 +71,13 @@ extern "C" {
* \note If you are using the PK interface to perform operations on * \note If you are using the PK interface to perform operations on
* keys, call the functions in pk.h. The interface in this file should only * keys, call the functions in pk.h. The interface in this file should only
* be used by implementers of opaque key engines. * be used by implementers of opaque key engines.
*
* \warning: Do not declare this structure directly! It may be extended in
* future* versions of Mbed TLS. Call the macro
* MBEDTLS_PK_OPAQUE_INFO_1() or MBEDTLS_PK_OPAQUE_INFO_ASYNC_1() instead.
* These macros are guaranteed to take parameters with the same type
* and semantics as previous versions and fill any new field of the
* structure with sensible values.
*/ */
struct mbedtls_pk_info_t struct mbedtls_pk_info_t
{ {
@ -220,6 +227,36 @@ struct mbedtls_pk_info_t
}; };
#define MBEDTLS_PK_OPAQUE_INFO_1( \
name \
, get_bitlen \
, can_do \
, signature_size_func \
, verify_func \
, sign_func \
, decrypt_func \
, encrypt_func \
, check_pair_func \
, ctx_alloc_func \
, ctx_free_func \
, debug_func \
) \
{ \
MBEDTLS_PK_OPAQUE \
, name \
, get_bitlen \
, can_do \
, signature_size_func \
, verify_func \
, sign_func \
, decrypt_func \
, encrypt_func \
, check_pair_func \
, ctx_alloc_func \
, ctx_free_func \
, debug_func \
}
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

116
tests/suites/test_suite_pk.function
View file

@ -746,21 +746,20 @@ exit:
void pk_opaque_mock( ) void pk_opaque_mock( )
{ {
mbedtls_pk_info_t info = mbedtls_pk_info_t info =
{ MBEDTLS_PK_OPAQUE_INFO_1(
MBEDTLS_PK_OPAQUE, "mock"
"mock", , opaque_mock_get_bitlen
opaque_mock_get_bitlen, , opaque_mock_can_do
opaque_mock_can_do, , opaque_mock_signature_size_func
opaque_mock_signature_size_func, , opaque_mock_verify_func
opaque_mock_verify_func, , opaque_mock_sign_func
opaque_mock_sign_func, , opaque_mock_decrypt_func
opaque_mock_decrypt_func, , opaque_mock_encrypt_func
opaque_mock_encrypt_func, , opaque_mock_check_pair_func
opaque_mock_check_pair_func, , opaque_mock_ctx_alloc_func
opaque_mock_ctx_alloc_func, , opaque_mock_ctx_free_func
opaque_mock_ctx_free_func, , opaque_mock_debug_func
opaque_mock_debug_func, );
};
mbedtls_pk_context ctx; mbedtls_pk_context ctx;
unsigned char sig[OPAQUE_MOCK_SIGNATURE_SIZE] = OPAQUE_MOCK_GOOD_SIGNATURE; unsigned char sig[OPAQUE_MOCK_SIGNATURE_SIZE] = OPAQUE_MOCK_GOOD_SIGNATURE;
unsigned char input[sizeof( opaque_mock_reference_input )]; unsigned char input[sizeof( opaque_mock_reference_input )];
@ -857,21 +856,20 @@ exit:
void pk_opaque_minimal( ) void pk_opaque_minimal( )
{ {
mbedtls_pk_info_t info = mbedtls_pk_info_t info =
{ MBEDTLS_PK_OPAQUE_INFO_1(
MBEDTLS_PK_OPAQUE, "mock"
"mock", , opaque_mock_get_bitlen
opaque_mock_get_bitlen, , opaque_mock_can_do
opaque_mock_can_do, , NULL
NULL, , NULL
NULL, , NULL
NULL, , NULL
NULL, , NULL
NULL, , NULL
NULL, , NULL
NULL, , opaque_mock_ctx_free_func
opaque_mock_ctx_free_func, , NULL
NULL, );
};
mbedtls_pk_context ctx; mbedtls_pk_context ctx;
mbedtls_pk_init( &ctx ); mbedtls_pk_init( &ctx );
@ -928,21 +926,20 @@ exit:
void pk_opaque_fail_allocation( ) void pk_opaque_fail_allocation( )
{ {
mbedtls_pk_info_t info = mbedtls_pk_info_t info =
{ MBEDTLS_PK_OPAQUE_INFO_1(
MBEDTLS_PK_OPAQUE, "mock"
"mock", , opaque_mock_get_bitlen
NULL, , opaque_mock_can_do
NULL, , NULL
NULL, , NULL
NULL, , NULL
NULL, , NULL
NULL, , NULL
NULL, , NULL
NULL, , opaque_mock_ctx_alloc_fail
opaque_mock_ctx_alloc_fail, , NULL
NULL, , NULL
NULL, );
};
mbedtls_pk_context ctx; mbedtls_pk_context ctx;
mbedtls_pk_init( &ctx ); mbedtls_pk_init( &ctx );
TEST_ASSERT( mbedtls_pk_setup( &ctx, &info ) == TEST_ASSERT( mbedtls_pk_setup( &ctx, &info ) ==
@ -964,21 +961,20 @@ void pk_opaque_wrapper( )
const mbedtls_pk_info_t *mbedtls_rsa_info = const mbedtls_pk_info_t *mbedtls_rsa_info =
mbedtls_pk_info_from_type( MBEDTLS_PK_RSA ); mbedtls_pk_info_from_type( MBEDTLS_PK_RSA );
mbedtls_pk_info_t pk_rsa_opaque_info = mbedtls_pk_info_t pk_rsa_opaque_info =
{ MBEDTLS_PK_OPAQUE_INFO_1(
MBEDTLS_PK_OPAQUE, "RSA-opaque-wrapper"
"RSA-opaque-wrapper", , mbedtls_rsa_info->get_bitlen
mbedtls_rsa_info->get_bitlen, , mbedtls_rsa_info->can_do
mbedtls_rsa_info->can_do, , mbedtls_rsa_info->signature_size_func
mbedtls_rsa_info->signature_size_func, , mbedtls_rsa_info->verify_func
mbedtls_rsa_info->verify_func, , mbedtls_rsa_info->sign_func
mbedtls_rsa_info->sign_func, , mbedtls_rsa_info->decrypt_func
mbedtls_rsa_info->decrypt_func, , mbedtls_rsa_info->encrypt_func
mbedtls_rsa_info->encrypt_func, , NULL // we don't test check_pair here
NULL, // we don't test check_pair here , mbedtls_rsa_info->ctx_alloc_func
mbedtls_rsa_info->ctx_alloc_func, , mbedtls_rsa_info->ctx_free_func
mbedtls_rsa_info->ctx_free_func, , mbedtls_rsa_info->debug_func
mbedtls_rsa_info->debug_func, );
};
/* Generate an RSA key to use in both contexts */ /* Generate an RSA key to use in both contexts */
pk_rsa_prepare( &raw ); pk_rsa_prepare( &raw );