diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-12 09:49:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-12 09:49:38 +0100 |
commit | f6e62f1147fee45a24900360c61b768f7f395794 (patch) | |
tree | a1e6d05eb6e4d4abca54cdcca2dbd99d50fb9e9d /thirdparty/mbedtls/library/ssl_tls.c | |
parent | 94bf2f648ee239a2f8d86aec23a6c1a35bef9332 (diff) | |
parent | a3d77be53b066e87199d1f91047fa40cb062f77f (diff) |
Merge pull request #33560 from akien-mga/mbedtls-2.16.3
mbedtls: Update to upstream version 2.16.3
Diffstat (limited to 'thirdparty/mbedtls/library/ssl_tls.c')
-rw-r--r-- | thirdparty/mbedtls/library/ssl_tls.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/thirdparty/mbedtls/library/ssl_tls.c b/thirdparty/mbedtls/library/ssl_tls.c index 38690fa664..b8f35fec5d 100644 --- a/thirdparty/mbedtls/library/ssl_tls.c +++ b/thirdparty/mbedtls/library/ssl_tls.c @@ -2606,7 +2606,7 @@ int mbedtls_ssl_fetch_input( mbedtls_ssl_context *ssl, size_t nb_want ) } /* - * A record can't be split accross datagrams. If we need to read but + * A record can't be split across datagrams. If we need to read but * are not at the beginning of a new record, the caller did something * wrong. */ @@ -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 |