yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 08:05:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ecp: Remove dependency on TLS and X.509"

Browse Source 
This reverts commit de0a41b716.
This commit is contained in:
Gilles Peskine 2020-02-26 19:52:06 +01:00 committed by Ronald Cron
parent d40f0070ec
commit 1174db5bac
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configs/config-psa-crypto.h
View File

@ -726,11 +726,11 @@
* Enable "non-blocking" ECC operations that can return early and be resumed. * Enable "non-blocking" ECC operations that can return early and be resumed.
* *
* This allows various functions to pause by returning * This allows various functions to pause by returning
* #MBEDTLS_ERR_ECP_IN_PROGRESS (or, for functions in Mbed TLS's SSL module, * #MBEDTLS_ERR_ECP_IN_PROGRESS (or, for functions in the SSL module,
* MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS) and then be called later again in order * #MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS) and then be called later again in
* to further progress and eventually complete their operation. This is * order to further progress and eventually complete their operation. This is
* controlled through mbedtls_ecp_set_max_ops() which limits the maximum number * controlled through mbedtls_ecp_set_max_ops() which limits the maximum
* of ECC operations a function may perform before pausing; see * number of ECC operations a function may perform before pausing; see
* mbedtls_ecp_set_max_ops() for more information. * mbedtls_ecp_set_max_ops() for more information.
* *
* This is useful in non-threaded environments if you want to avoid blocking * This is useful in non-threaded environments if you want to avoid blocking

10
include/mbedtls/config.h
View File

@ -787,11 +787,11 @@
* Enable "non-blocking" ECC operations that can return early and be resumed. * Enable "non-blocking" ECC operations that can return early and be resumed.
* *
* This allows various functions to pause by returning * This allows various functions to pause by returning
* #MBEDTLS_ERR_ECP_IN_PROGRESS (or, for functions in Mbed TLS's SSL module, * #MBEDTLS_ERR_ECP_IN_PROGRESS (or, for functions in the SSL module,
* MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS) and then be called later again in order * #MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS) and then be called later again in
* to further progress and eventually complete their operation. This is * order to further progress and eventually complete their operation. This is
* controlled through mbedtls_ecp_set_max_ops() which limits the maximum number * controlled through mbedtls_ecp_set_max_ops() which limits the maximum
* of ECC operations a function may perform before pausing; see * number of ECC operations a function may perform before pausing; see
* mbedtls_ecp_set_max_ops() for more information. * mbedtls_ecp_set_max_ops() for more information.
* *
* This is useful in non-threaded environments if you want to avoid blocking * This is useful in non-threaded environments if you want to avoid blocking

24
include/mbedtls/ecp.h
View File

@ -375,19 +375,19 @@ mbedtls_ecp_keypair;
* same; they must not be used until the function finally * same; they must not be used until the function finally
* returns 0. * returns 0.
* *
* This only applies to functions whose documentation mentions * This only applies to functions whose documentation
* they may return #MBEDTLS_ERR_ECP_IN_PROGRESS (or * mentions they may return #MBEDTLS_ERR_ECP_IN_PROGRESS (or
* `MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS` for functions in the * #MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS for functions in the
* Mbed TLS SSL module). For functions that accept a "restart * SSL module). For functions that accept a "restart context"
* context" argument, passing NULL disables restart and makes * argument, passing NULL disables restart and makes the
* the function equivalent to the function with the same name * function equivalent to the function with the same name
* with \c _restartable removed. For functions in the ECDH * with \c _restartable removed. For functions in the ECDH
* module, restart is disabled unless the function accepts an * module, restart is disabled unless the function accepts
* "ECDH context" argument and mbedtls_ecdh_enable_restart() * an "ECDH context" argument and
* was previously called on that context. For function in the * mbedtls_ecdh_enable_restart() was previously called on
* Mbed TLS SSL module, restart is only enabled for specific * that context. For function in the SSL module, restart is
* sides and key exchanges (currently only for clients and * only enabled for specific sides and key exchanges
* ECDHE-ECDSA). * (currently only for clients and ECDHE-ECDSA).
* *
* \param max_ops Maximum number of basic operations done in a row. * \param max_ops Maximum number of basic operations done in a row.
* Default: 0 (unlimited). * Default: 0 (unlimited).

2
library/ecp.c
View File

@ -374,7 +374,7 @@ int mbedtls_ecp_check_budget( const mbedtls_ecp_group *grp,
* Curves are listed in order: largest curves first, and for a given size, * Curves are listed in order: largest curves first, and for a given size,
* fastest curves first. This provides the default order for the SSL module. * fastest curves first. This provides the default order for the SSL module.
* *
* Reminder: update profiles in Mbed TLS's x509_crt.c when adding new curves! * Reminder: update profiles in x509_crt.c when adding a new curves!
*/ */
static const mbedtls_ecp_curve_info ecp_supported_curves[] = static const mbedtls_ecp_curve_info ecp_supported_curves[] =
{ {