mirror of
https://git.suyu.dev/suyu/mbedtls.git
synced 2025-12-23 15:55:10 +01:00
Merge remote-tracking branch 'origin/pr/2714' into mbedtls-2.16
* origin/pr/2714: programs: Make `make clean` clean all programs always ssl_tls: Enable Suite B with subset of ECP curves windows: Fix Release x64 configuration timing: Remove redundant include file net_sockets: Fix typo in net_would_block()
This commit is contained in:
commit
7f132cc1a3
54 changed files with 15 additions and 51 deletions
|
|
@ -284,7 +284,7 @@ static int net_would_block( const mbedtls_net_context *ctx )
|
|||
int err = errno;
|
||||
|
||||
/*
|
||||
* Never return 'WOULD BLOCK' on a non-blocking socket
|
||||
* Never return 'WOULD BLOCK' on a blocking socket
|
||||
*/
|
||||
if( ( fcntl( ctx->fd, F_GETFL ) & O_NONBLOCK ) != O_NONBLOCK )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -9043,8 +9043,12 @@ static int ssl_preset_suiteb_hashes[] = {
|
|||
|
||||
#if defined(MBEDTLS_ECP_C)
|
||||
static mbedtls_ecp_group_id ssl_preset_suiteb_curves[] = {
|
||||
#if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
|
||||
MBEDTLS_ECP_DP_SECP256R1,
|
||||
#endif
|
||||
#if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
|
||||
MBEDTLS_ECP_DP_SECP384R1,
|
||||
#endif
|
||||
MBEDTLS_ECP_DP_NONE
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@
|
|||
#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
|
||||
|
||||
#include <windows.h>
|
||||
#include <winbase.h>
|
||||
#include <process.h>
|
||||
|
||||
struct _hr_time
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue