generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

s3_cbc.c: fix warning [in Windows build].

Browse Source
This commit is contained in:
Andy Polyakov
2013-02-08 14:22:22 +01:00
parent 2141e6f30b
commit 0e4f7045ea
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ssl/s3_cbc.c
View File

@@ -84,7 +84,7 @@ static unsigned constant_time_ge(unsigned a, unsigned b)
} }
/* constant_time_eq_8 returns 0xff if a==b and 0x00 otherwise. */ /* constant_time_eq_8 returns 0xff if a==b and 0x00 otherwise. */
static unsigned char constant_time_eq_8(unsigned char a, unsigned char b) static unsigned char constant_time_eq_8(unsigned a, unsigned b)
{ {
unsigned c = a ^ b; unsigned c = a ^ b;
c--; c--;
@@ -302,14 +302,14 @@ void ssl3_cbc_copy_mac(unsigned char* out,
j = 0; j = 0;
for (i = 0; i < md_size; i++) for (i = 0; i < md_size; i++)
{ {
unsigned char offset = (div_spoiler + rotate_offset + i) % md_size; unsigned offset = (div_spoiler + rotate_offset + i) % md_size;
out[j++] = rotated_mac[offset]; out[j++] = rotated_mac[offset];
} }
#else #else
memset(out, 0, md_size); memset(out, 0, md_size);
for (i = 0; i < md_size; i++) for (i = 0; i < md_size; i++)
{ {
unsigned char offset = (div_spoiler + md_size - rotate_offset + i) % md_size; unsigned offset = (div_spoiler + md_size - rotate_offset + i) % md_size;
for (j = 0; j < md_size; j++) for (j = 0; j < md_size; j++)
out[j] |= rotated_mac[i] & constant_time_eq_8(j, offset); out[j] |= rotated_mac[i] & constant_time_eq_8(j, offset);
} }