mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-26 19:55:36 +01:00
Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted
This commit is contained in:
commit
035f6ea288
@ -94,7 +94,7 @@ Bugfix
|
||||
fragile yet non-exploitable code-paths.
|
||||
* Fix crash when calling mbedtls_ssl_cache_free() twice. Found by
|
||||
MilenkoMitrovic, #1104
|
||||
* Fix mbedtls_timing_alarm(0) on Unix.
|
||||
* Fix mbedtls_timing_alarm(0) on Unix and MinGw.
|
||||
* Fix use of uninitialized memory in mbedtls_timing_get_timer when reset=1.
|
||||
* Fix issue in RSA key generation program programs/x509/rsa_genkey
|
||||
where the failure of CTR DRBG initialization lead to freeing an
|
||||
|
@ -273,6 +273,14 @@ void mbedtls_set_alarm( int seconds )
|
||||
{
|
||||
DWORD ThreadId;
|
||||
|
||||
if( seconds == 0 )
|
||||
{
|
||||
/* No need to create a thread for this simple case.
|
||||
* Also, this shorcut is more reliable at least on MinGW32 */
|
||||
mbedtls_timing_alarmed = 1;
|
||||
return;
|
||||
}
|
||||
|
||||
mbedtls_timing_alarmed = 0;
|
||||
alarmMs = seconds * 1000;
|
||||
CloseHandle( CreateThread( NULL, 0, TimerProc, NULL, 0, &ThreadId ) );
|
||||
|
Loading…
Reference in New Issue
Block a user