oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

heimdal: Avoid overflow when performing bitwise shift operations

Browse Source 
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
This commit is contained in:
Joseph Sutton
2021-07-14 16:04:48 +12:00
committed by Jeffrey Altman
parent bc37bf1afd
commit 1c93a6ff26
5 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/asn1/template.c
View File

@@ -115,9 +115,9 @@ _asn1_bmember_get_bit(const unsigned char *p, void *data,
unsigned int localbit = bit % 8;
if ((*p >> (7 - localbit)) & 1) {
#ifdef WORDS_BIGENDIAN
*(unsigned int *)data |= (1 << ((size * 8) - bit - 1));
*(unsigned int *)data |= (1u << ((size * 8) - bit - 1));
#else
*(unsigned int *)data |= (1 << bit);
*(unsigned int *)data |= (1u << bit);
#endif
}
}
@@ -126,11 +126,11 @@ int
_asn1_bmember_isset_bit(const void *data, unsigned int bit, size_t size)
{
#ifdef WORDS_BIGENDIAN
if ((*(unsigned int *)data) & (1 << ((size * 8) - bit - 1)))
if ((*(unsigned int *)data) & (1u << ((size * 8) - bit - 1)))
return 1;
return 0;
#else
if ((*(unsigned int *)data) & (1 << bit))
if ((*(unsigned int *)data) & (1u << bit))
return 1;
return 0;
#endif
@@ -143,7 +143,7 @@ _asn1_bmember_put_bit(unsigned char *p, const void *data, unsigned int bit,
unsigned int localbit = bit % 8;
if (_asn1_bmember_isset_bit(data, bit, size)) {
*p |= (1 << (7 - localbit));
*p |= (1u << (7 - localbit));
if (*bitset == 0)
*bitset = (7 - localbit) + 1;
}