AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #149 from gilles-peskine-arm/havege-asan-crypto

Browse Source 
Fix misuse of signed ints in the HAVEGE module
This commit is contained in:
Jaeden Amero 2019-07-05 15:30:30 +01:00 committed by GitHub
commit b6229e304e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/mbedtls/havege.h
View File

@ -31,6 +31,7 @@
#endif #endif
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
#define MBEDTLS_HAVEGE_COLLECT_SIZE 1024 #define MBEDTLS_HAVEGE_COLLECT_SIZE 1024
@ -43,9 +44,9 @@ extern "C" {
*/ */
typedef struct mbedtls_havege_state typedef struct mbedtls_havege_state
{ {
int PT1, PT2, offset[2]; uint32_t PT1, PT2, offset[2];
int pool[MBEDTLS_HAVEGE_COLLECT_SIZE]; uint32_t pool[MBEDTLS_HAVEGE_COLLECT_SIZE];
int WALK[8192]; uint32_t WALK[8192];
} }
mbedtls_havege_state; mbedtls_havege_state;

22
library/havege.c
View File

@ -38,6 +38,7 @@
#include "mbedtls/timing.h" #include "mbedtls/timing.h"
#include "mbedtls/platform_util.h" #include "mbedtls/platform_util.h"
#include <stdint.h>
#include <string.h> #include <string.h>
/* ------------------------------------------------------------------------ /* ------------------------------------------------------------------------
@ -54,7 +55,7 @@
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
*/ */
#define SWAP(X,Y) { int *T = (X); (X) = (Y); (Y) = T; } #define SWAP(X,Y) { uint32_t *T = (X); (X) = (Y); (Y) = T; }
#define TST1_ENTER if( PTEST & 1 ) { PTEST ^= 3; PTEST >>= 1; #define TST1_ENTER if( PTEST & 1 ) { PTEST ^= 3; PTEST >>= 1;
#define TST2_ENTER if( PTEST & 1 ) { PTEST ^= 3; PTEST >>= 1; #define TST2_ENTER if( PTEST & 1 ) { PTEST ^= 3; PTEST >>= 1;
@ -77,7 +78,7 @@
PTX = (PT1 >> 18) & 7; \ PTX = (PT1 >> 18) & 7; \
PT1 &= 0x1FFF; \ PT1 &= 0x1FFF; \
PT2 &= 0x1FFF; \ PT2 &= 0x1FFF; \
CLK = (int) mbedtls_timing_hardclock(); \ CLK = (uint32_t) mbedtls_timing_hardclock(); \
\ \
i = 0; \ i = 0; \
A = &WALK[PT1 ]; RES[i++] ^= *A; \ A = &WALK[PT1 ]; RES[i++] ^= *A; \
@ -100,7 +101,7 @@
\ \
IN = (*A >> (5)) ^ (*A << (27)) ^ CLK; \ IN = (*A >> (5)) ^ (*A << (27)) ^ CLK; \
*A = (*B >> (6)) ^ (*B << (26)) ^ CLK; \ *A = (*B >> (6)) ^ (*B << (26)) ^ CLK; \
*B = IN; CLK = (int) mbedtls_timing_hardclock(); \ *B = IN; CLK = (uint32_t) mbedtls_timing_hardclock(); \
*C = (*C >> (7)) ^ (*C << (25)) ^ CLK; \ *C = (*C >> (7)) ^ (*C << (25)) ^ CLK; \
*D = (*D >> (8)) ^ (*D << (24)) ^ CLK; \ *D = (*D >> (8)) ^ (*D << (24)) ^ CLK; \
\ \
@ -158,10 +159,11 @@
*/ */
static void havege_fill( mbedtls_havege_state *hs ) static void havege_fill( mbedtls_havege_state *hs )
{ {
int i, n = 0; size_t n = 0;
int U1, U2, *A, *B, *C, *D; size_t i;
int PT1, PT2, *WALK, RES[16]; uint32_t U1, U2, *A, *B, *C, *D;
int PTX, PTY, CLK, PTEST, IN; uint32_t PT1, PT2, *WALK, RES[16];
uint32_t PTX, PTY, CLK, PTEST, IN;
WALK = hs->WALK; WALK = hs->WALK;
PT1 = hs->PT1; PT1 = hs->PT1;
@ -212,7 +214,7 @@ void mbedtls_havege_free( mbedtls_havege_state *hs )
*/ */
int mbedtls_havege_random( void *p_rng, unsigned char *buf, size_t len ) int mbedtls_havege_random( void *p_rng, unsigned char *buf, size_t len )
{ {
int val; uint32_t val;
size_t use_len; size_t use_len;
mbedtls_havege_state *hs = (mbedtls_havege_state *) p_rng; mbedtls_havege_state *hs = (mbedtls_havege_state *) p_rng;
unsigned char *p = buf; unsigned char *p = buf;
@ -220,8 +222,8 @@ int mbedtls_havege_random( void *p_rng, unsigned char *buf, size_t len )
while( len > 0 ) while( len > 0 )
{ {
use_len = len; use_len = len;
if( use_len > sizeof(int) ) if( use_len > sizeof( val ) )
use_len = sizeof(int); use_len = sizeof( val );
if( hs->offset[1] >= MBEDTLS_HAVEGE_COLLECT_SIZE ) if( hs->offset[1] >= MBEDTLS_HAVEGE_COLLECT_SIZE )
havege_fill( hs ); havege_fill( hs );