summaryrefslogtreecommitdiffstats
path: root/ssl/s3_cbc.c
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2013-02-08 14:22:22 +0100
committerAndy Polyakov <appro@openssl.org>2013-02-08 14:22:22 +0100
commit0e4f7045ead0bec435f4097f4a68343163d0a860 (patch)
tree0fee9bfe7753d4baa69f6d7fd4b7a68ce19e881c /ssl/s3_cbc.c
parent2141e6f30b1fd2906830fd23d8eae71fe72acc47 (diff)
s3_cbc.c: fix warning [in Windows build].
Diffstat (limited to 'ssl/s3_cbc.c')
-rw-r--r--ssl/s3_cbc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
index 2e9765e963..8472158233 100644
--- a/ssl/s3_cbc.c
+++ b/ssl/s3_cbc.c
@@ -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. */
-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;
c--;
@@ -302,14 +302,14 @@ void ssl3_cbc_copy_mac(unsigned char* out,
j = 0;
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];
}
#else
memset(out, 0, md_size);
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++)
out[j] |= rotated_mac[i] & constant_time_eq_8(j, offset);
}