ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-06-24 22:29:04 +08:00
Code Issues Releases Wiki Activity

pk_wrap: name all the fields of the pk_info structs

Browse Source 
Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2023-06-21 18:16:49 +02:00
parent e77307738d
commit f69514a7d8
1 changed files with 73 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
library/pk_wrap.c
View File

@ -611,26 +611,18 @@ static void rsa_debug(mbedtls_pk_context *pk, mbedtls_pk_debug_item *items)
} }
const mbedtls_pk_info_t mbedtls_rsa_info = { const mbedtls_pk_info_t mbedtls_rsa_info = {
MBEDTLS_PK_RSA, .type = MBEDTLS_PK_RSA,
"RSA", .name = "RSA",
rsa_get_bitlen, .get_bitlen = rsa_get_bitlen,
rsa_can_do, .can_do = rsa_can_do,
rsa_verify_wrap, .verify_func = rsa_verify_wrap,
rsa_sign_wrap, .sign_func = rsa_sign_wrap,
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) .decrypt_func = rsa_decrypt_wrap,
NULL, .encrypt_func = rsa_encrypt_wrap,
NULL, .check_pair_func = rsa_check_pair_wrap,
#endif .ctx_alloc_func = rsa_alloc_wrap,
rsa_decrypt_wrap, .ctx_free_func = rsa_free_wrap,
rsa_encrypt_wrap, .debug_func = rsa_debug,
rsa_check_pair_wrap,
rsa_alloc_wrap,
rsa_free_wrap,
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
NULL,
NULL,
#endif
rsa_debug,
}; };
#endif /* MBEDTLS_RSA_C */ #endif /* MBEDTLS_RSA_C */
@ -1349,39 +1341,30 @@ static void eckey_debug(mbedtls_pk_context *pk, mbedtls_pk_debug_item *items)
} }
const mbedtls_pk_info_t mbedtls_eckey_info = { const mbedtls_pk_info_t mbedtls_eckey_info = {
MBEDTLS_PK_ECKEY, .type = MBEDTLS_PK_ECKEY,
"EC", .name = "EC",
eckey_get_bitlen, .get_bitlen = eckey_get_bitlen,
eckey_can_do, .can_do = eckey_can_do,
#if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY) #if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY)
ecdsa_verify_wrap, /* Compatible key structures */ .verify_func = ecdsa_verify_wrap, /* Compatible key structures */
#else
NULL,
#endif #endif
#if defined(MBEDTLS_PK_CAN_ECDSA_SIGN) #if defined(MBEDTLS_PK_CAN_ECDSA_SIGN)
ecdsa_sign_wrap, /* Compatible key structures */ .sign_func = ecdsa_sign_wrap, /* Compatible key structures */
#else
NULL,
#endif #endif
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
eckey_verify_rs_wrap, .verify_rs_func = eckey_verify_rs_wrap,
eckey_sign_rs_wrap, .sign_rs_func = eckey_sign_rs_wrap,
#endif #endif
NULL, .check_pair_func = eckey_check_pair,
NULL, #if !defined(MBEDTLS_PK_USE_PSA_EC_DATA)
eckey_check_pair, .ctx_alloc_func = eckey_alloc_wrap,
#if defined(MBEDTLS_PK_USE_PSA_EC_DATA) .ctx_free_func = eckey_free_wrap,
NULL,
NULL,
#else /* MBEDTLS_PK_USE_PSA_EC_DATA */
eckey_alloc_wrap,
eckey_free_wrap,
#endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
eckey_rs_alloc, .rs_alloc_func = eckey_rs_alloc,
eckey_rs_free, .rs_free_func = eckey_rs_free,
#endif #endif
eckey_debug, .debug_func = eckey_debug,
}; };
/* /*
@ -1394,31 +1377,16 @@ static int eckeydh_can_do(mbedtls_pk_type_t type)
} }
const mbedtls_pk_info_t mbedtls_eckeydh_info = { const mbedtls_pk_info_t mbedtls_eckeydh_info = {
MBEDTLS_PK_ECKEY_DH, .type = MBEDTLS_PK_ECKEY_DH,
"EC_DH", .name = "EC_DH",
eckey_get_bitlen, /* Same underlying key structure */ .get_bitlen = eckey_get_bitlen, /* Same underlying key structure */
eckeydh_can_do, .can_do = eckeydh_can_do,
NULL, .check_pair_func = eckey_check_pair,
NULL, #if !defined(MBEDTLS_PK_USE_PSA_EC_DATA)
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) .ctx_alloc_func = eckey_alloc_wrap, /* Same underlying key structure */
NULL, .ctx_free_func = eckey_free_wrap, /* Same underlying key structure */
NULL,
#endif
NULL,
NULL,
eckey_check_pair,
#if defined(MBEDTLS_PK_USE_PSA_EC_DATA)
NULL,
NULL,
#else /* MBEDTLS_PK_USE_PSA_EC_DATA */
eckey_alloc_wrap, /* Same underlying key structure */
eckey_free_wrap, /* Same underlying key structure */
#endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) .debug_func = eckey_debug, /* Same underlying key structure */
NULL,
NULL,
#endif
eckey_debug, /* Same underlying key structure */
}; };
#endif /* MBEDTLS_PK_HAVE_ECC_KEYS */ #endif /* MBEDTLS_PK_HAVE_ECC_KEYS */
@ -1481,39 +1449,30 @@ static void ecdsa_rs_free(void *ctx)
#endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */ #endif /* MBEDTLS_ECDSA_C && MBEDTLS_ECP_RESTARTABLE */
const mbedtls_pk_info_t mbedtls_ecdsa_info = { const mbedtls_pk_info_t mbedtls_ecdsa_info = {
MBEDTLS_PK_ECDSA, .type = MBEDTLS_PK_ECDSA,
"ECDSA", .name = "ECDSA",
eckey_get_bitlen, /* Compatible key structures */ .get_bitlen = eckey_get_bitlen, /* Compatible key structures */
ecdsa_can_do, .can_do = ecdsa_can_do,
#if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY) #if defined(MBEDTLS_PK_CAN_ECDSA_VERIFY)
ecdsa_verify_wrap, /* Compatible key structures */ .verify_func = ecdsa_verify_wrap, /* Compatible key structures */
#else
NULL,
#endif #endif
#if defined(MBEDTLS_PK_CAN_ECDSA_SIGN) #if defined(MBEDTLS_PK_CAN_ECDSA_SIGN)
ecdsa_sign_wrap, /* Compatible key structures */ .sign_func = ecdsa_sign_wrap, /* Compatible key structures */
#else
NULL,
#endif #endif
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
ecdsa_verify_rs_wrap, .verify_rs_func = ecdsa_verify_rs_wrap,
ecdsa_sign_rs_wrap, .sign_rs_func = ecdsa_sign_rs_wrap,
#endif #endif
NULL, .check_pair_func = eckey_check_pair, /* Compatible key structures */
NULL, #if !defined(MBEDTLS_PK_USE_PSA_EC_DATA)
eckey_check_pair, /* Compatible key structures */ .ctx_alloc_func = eckey_alloc_wrap, /* Compatible key structures */
#if defined(MBEDTLS_PK_USE_PSA_EC_DATA) .ctx_free_func = eckey_free_wrap, /* Compatible key structures */
NULL,
NULL,
#else /* MBEDTLS_PK_USE_PSA_EC_DATA */
eckey_alloc_wrap, /* Compatible key structures */
eckey_free_wrap, /* Compatible key structures */
#endif /* MBEDTLS_PK_USE_PSA_EC_DATA */ #endif /* MBEDTLS_PK_USE_PSA_EC_DATA */
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
ecdsa_rs_alloc, .rs_alloc_func = ecdsa_rs_alloc,
ecdsa_rs_free, .rs_free_func = ecdsa_rs_free,
#endif #endif
eckey_debug, /* Compatible key structures */ .debug_func = eckey_debug, /* Compatible key structures */
}; };
#endif /* MBEDTLS_PK_CAN_ECDSA_SOME */ #endif /* MBEDTLS_PK_CAN_ECDSA_SOME */
@ -1625,32 +1584,18 @@ static void rsa_alt_free_wrap(void *ctx)
} }
const mbedtls_pk_info_t mbedtls_rsa_alt_info = { const mbedtls_pk_info_t mbedtls_rsa_alt_info = {
MBEDTLS_PK_RSA_ALT, .type = MBEDTLS_PK_RSA_ALT,
"RSA-alt", .name = "RSA-alt",
rsa_alt_get_bitlen, .get_bitlen = rsa_alt_get_bitlen,
rsa_alt_can_do, .can_do = rsa_alt_can_do,
NULL, .sign_func = rsa_alt_sign_wrap,
rsa_alt_sign_wrap, .decrypt_func = rsa_alt_decrypt_wrap,
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
NULL,
NULL,
#endif
rsa_alt_decrypt_wrap,
NULL,
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
rsa_alt_check_pair, .check_pair_func = rsa_alt_check_pair,
#else
NULL,
#endif #endif
rsa_alt_alloc_wrap, .ctx_alloc_func = rsa_alt_alloc_wrap,
rsa_alt_free_wrap, .ctx_free_func = rsa_alt_free_wrap,
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
NULL,
NULL,
#endif
NULL,
}; };
#endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */ #endif /* MBEDTLS_PK_RSA_ALT_SUPPORT */
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
@ -1783,26 +1728,13 @@ static int pk_opaque_ec_check_pair(mbedtls_pk_context *pub, mbedtls_pk_context *
} }
const mbedtls_pk_info_t mbedtls_pk_ecdsa_opaque_info = { const mbedtls_pk_info_t mbedtls_pk_ecdsa_opaque_info = {
MBEDTLS_PK_OPAQUE, .type = MBEDTLS_PK_OPAQUE,
"Opaque", .name = "Opaque",
pk_opaque_get_bitlen, .get_bitlen = pk_opaque_get_bitlen,
pk_opaque_ecdsa_can_do, .can_do = pk_opaque_ecdsa_can_do,
ecdsa_verify_wrap_opaque, .verify_func = ecdsa_verify_wrap_opaque,
ecdsa_sign_wrap_opaque, .sign_func = ecdsa_sign_wrap_opaque,
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE) .check_pair_func = pk_opaque_ec_check_pair,
NULL, /* restartable verify - not relevant */
NULL, /* restartable sign - not relevant */
#endif
NULL, /* decrypt - not relevant */
NULL, /* encrypt - not relevant */
pk_opaque_ec_check_pair,
NULL, /* alloc - no need to allocate new data dynamically */
NULL, /* free - as for the alloc, there is no data to free */
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
NULL, /* restart alloc - not relevant */
NULL, /* restart free - not relevant */
#endif
NULL, /* debug - could be done later, or even left NULL */
}; };
#if defined(MBEDTLS_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_LEGACY) #if defined(MBEDTLS_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_LEGACY)
@ -1830,30 +1762,14 @@ static int pk_opaque_rsa_decrypt(mbedtls_pk_context *pk,
#endif /* MBEDTLS_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_LEGACY */ #endif /* MBEDTLS_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_LEGACY */
const mbedtls_pk_info_t mbedtls_pk_rsa_opaque_info = { const mbedtls_pk_info_t mbedtls_pk_rsa_opaque_info = {
MBEDTLS_PK_OPAQUE, .type = MBEDTLS_PK_OPAQUE,
"Opaque", .name = "Opaque",
pk_opaque_get_bitlen, .get_bitlen = pk_opaque_get_bitlen,
pk_opaque_rsa_can_do, .can_do = pk_opaque_rsa_can_do,
NULL, /* verify - will be done later */ .sign_func = pk_opaque_sign_wrap,
pk_opaque_sign_wrap,
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
NULL, /* restartable verify - not relevant */
NULL, /* restartable sign - not relevant */
#endif
#if defined(MBEDTLS_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_LEGACY) #if defined(MBEDTLS_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_LEGACY)
pk_opaque_rsa_decrypt, .decrypt_func = pk_opaque_rsa_decrypt,
#else
NULL, /* decrypt - not available */
#endif /* PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY */ #endif /* PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY */
NULL, /* encrypt - will be done later */
NULL, /* check_pair - could be done later or left NULL */
NULL, /* alloc - no need to allocate new data dynamically */
NULL, /* free - as for the alloc, there is no data to free */
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_ECP_RESTARTABLE)
NULL, /* restart alloc - not relevant */
NULL, /* restart free - not relevant */
#endif
NULL, /* debug - could be done later, or even left NULL */
}; };
#endif /* MBEDTLS_USE_PSA_CRYPTO */ #endif /* MBEDTLS_USE_PSA_CRYPTO */