Merge remote-tracking branch 'public/pr/1646' into development

This commit is contained in:
Simon Butcher 2018-06-12 16:41:04 +01:00
commit ebb6427992
4 changed files with 29 additions and 8 deletions

View file

@ -630,7 +630,13 @@ static inline int mbedtls_ssl_safer_memcmp( const void *a, const void *b, size_t
volatile unsigned char diff = 0;
for( i = 0; i < n; i++ )
diff |= A[i] ^ B[i];
{
/* Read volatile data in order before computing diff.
* This avoids IAR compiler warning:
* 'the order of volatile accesses is undefined ..' */
unsigned char x = A[i], y = B[i];
diff |= x ^ y;
}
return( diff );
}