yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 10:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmac: make subkey gen more constant-time

Browse source 
The previous version had secret-dependent memory accesses. While it was
probably not an issue in practice cause the two bytes of the array are
probably on the same cache line anyway, as a matter of principle this should
be avoided.
This commit is contained in:
Manuel Pégourié-Gonnard 2016-01-13 13:05:03 +00:00 committed by Simon Butcher
parent d6cf75474b
commit 475f06f609
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
library/cmac.c
View file

@ -93,7 +93,8 @@ void mbedtls_cmac_init( mbedtls_cmac_context *ctx )
*/
static void multiply_by_u( unsigned char *output, const unsigned char *input )
{
static const unsigned char Rb[2] = { 0x00, 0x87 }; /* block size 16 only */
const unsigned char Rb = 0x87; /* block size 16 only */
unsigned char mask;
unsigned char overflow = 0;
int i;
@ -103,7 +104,20 @@ static void multiply_by_u( unsigned char *output, const unsigned char *input )
overflow = input[i] >> 7;
}
output[15] ^= Rb[input[0] >> 7]; /* "Constant-time" operation */
/* mask = ( input[0] >> 7 ) ? 0xff : 0x00
* using bit operations to avoid branches */
/* MSVC has a warning about unary minus on unsigned, but this is
* well-defined and precisely what we want to do here */
#if defined(_MSC_VER)
#pragma warning( push )
#pragma warning( disable : 4146 )
#endif
mask = - ( input[0] >> 7 );
#if defined(_MSC_VER)
#pragma warning( pop )
#endif
output[15] ^= Rb & mask;
}
/*