diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-28 15:40:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-28 15:40:40 +0200 |
| commit | 04ec0bf5e1714131d31421f59083578236274ff7 (patch) | |
| tree | a2169e7883b981521a9900b76f7cbd9af1df1fac /thirdparty/mbedtls/library/pkcs5.c | |
| parent | bdbc63c4eeeb43176d48b40fb713e793c40a1f3d (diff) | |
| parent | d8e1cd7a109bc832826f21d6df1faf401be8dcc9 (diff) | |
| download | redot-engine-04ec0bf5e1714131d31421f59083578236274ff7.tar.gz | |
Merge pull request #20539 from akien-mga/mbedtls-2.12.0
mbedtls: Update to upstream version 2.12.0
Diffstat (limited to 'thirdparty/mbedtls/library/pkcs5.c')
| -rw-r--r-- | thirdparty/mbedtls/library/pkcs5.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/thirdparty/mbedtls/library/pkcs5.c b/thirdparty/mbedtls/library/pkcs5.c index 440a174b5b..f04f0ab25e 100644 --- a/thirdparty/mbedtls/library/pkcs5.c +++ b/thirdparty/mbedtls/library/pkcs5.c @@ -249,8 +249,10 @@ int mbedtls_pkcs5_pbkdf2_hmac( mbedtls_md_context_t *ctx, const unsigned char *p memset( counter, 0, 4 ); counter[3] = 1; +#if UINT_MAX > 0xFFFFFFFF if( iteration_count > 0xFFFFFFFF ) return( MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA ); +#endif while( key_length ) { |