Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-29 02:38:22 -05:00
Code Issues Projects Releases Wiki Activity

Replace macros with inline functions for WPA_{GET,PUT}_{BE,LE}*

Browse Source 
These verify that a proper pointer type is used and in addition, seems
to get rid of some false static analyzer warnings.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-01-01 20:32:36 +02:00
parent cbf61176ed
commit 301ed630a8
1 changed files with 93 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
src/utils/common.h
View File

@ -224,69 +224,105 @@ static inline unsigned int wpa_swap_32(unsigned int v)
/* Macros for handling unaligned memory accesses */ /* Macros for handling unaligned memory accesses */
#define WPA_GET_BE16(a) ((u16) (((a)[0] << 8) | (a)[1])) static inline u16 WPA_GET_BE16(const u8 *a)
#define WPA_PUT_BE16(a, val) \ {
do { \ return (a[0] << 8) | a[1];
(a)[0] = ((u16) (val)) >> 8; \ }
(a)[1] = ((u16) (val)) & 0xff; \
} while (0)
#define WPA_GET_LE16(a) ((u16) (((a)[1] << 8) | (a)[0])) static inline void WPA_PUT_BE16(u8 *a, u16 val)
#define WPA_PUT_LE16(a, val) \ {
do { \ a[0] = val >> 8;
(a)[1] = ((u16) (val)) >> 8; \ a[1] = val & 0xff;
(a)[0] = ((u16) (val)) & 0xff; \ }
} while (0)
#define WPA_GET_BE24(a) ((((u32) (a)[0]) << 16) | (((u32) (a)[1]) << 8) | \ static inline u16 WPA_GET_LE16(const u8 *a)
((u32) (a)[2])) {
#define WPA_PUT_BE24(a, val) \ return (a[1] << 8) | a[0];
do { \ }
(a)[0] = (u8) ((((u32) (val)) >> 16) & 0xff); \
(a)[1] = (u8) ((((u32) (val)) >> 8) & 0xff); \
(a)[2] = (u8) (((u32) (val)) & 0xff); \
} while (0)
#define WPA_GET_BE32(a) ((((u32) (a)[0]) << 24) | (((u32) (a)[1]) << 16) | \ static inline void WPA_PUT_LE16(u8 *a, u16 val)
(((u32) (a)[2]) << 8) | ((u32) (a)[3])) {
#define WPA_PUT_BE32(a, val) \ a[1] = val >> 8;
do { \ a[0] = val & 0xff;
(a)[0] = (u8) ((((u32) (val)) >> 24) & 0xff); \ }
(a)[1] = (u8) ((((u32) (val)) >> 16) & 0xff); \
(a)[2] = (u8) ((((u32) (val)) >> 8) & 0xff); \
(a)[3] = (u8) (((u32) (val)) & 0xff); \
} while (0)
#define WPA_GET_LE32(a) ((((u32) (a)[3]) << 24) | (((u32) (a)[2]) << 16) | \ static inline u32 WPA_GET_BE24(const u8 *a)
(((u32) (a)[1]) << 8) | ((u32) (a)[0])) {
#define WPA_PUT_LE32(a, val) \ return (a[0] << 16) | (a[1] << 8) | a[2];
do { \ }
(a)[3] = (u8) ((((u32) (val)) >> 24) & 0xff); \
(a)[2] = (u8) ((((u32) (val)) >> 16) & 0xff); \
(a)[1] = (u8) ((((u32) (val)) >> 8) & 0xff); \
(a)[0] = (u8) (((u32) (val)) & 0xff); \
} while (0)
#define WPA_GET_BE64(a) ((((u64) (a)[0]) << 56) | (((u64) (a)[1]) << 48) | \ static inline void WPA_PUT_BE24(u8 *a, u32 val)
(((u64) (a)[2]) << 40) | (((u64) (a)[3]) << 32) | \ {
(((u64) (a)[4]) << 24) | (((u64) (a)[5]) << 16) | \ a[0] = (val >> 16) & 0xff;
(((u64) (a)[6]) << 8) | ((u64) (a)[7])) a[1] = (val >> 8) & 0xff;
#define WPA_PUT_BE64(a, val) \ a[2] = val & 0xff;
do { \ }
(a)[0] = (u8) (((u64) (val)) >> 56); \
(a)[1] = (u8) (((u64) (val)) >> 48); \
(a)[2] = (u8) (((u64) (val)) >> 40); \
(a)[3] = (u8) (((u64) (val)) >> 32); \
(a)[4] = (u8) (((u64) (val)) >> 24); \
(a)[5] = (u8) (((u64) (val)) >> 16); \
(a)[6] = (u8) (((u64) (val)) >> 8); \
(a)[7] = (u8) (((u64) (val)) & 0xff); \
} while (0)
#define WPA_GET_LE64(a) ((((u64) (a)[7]) << 56) | (((u64) (a)[6]) << 48) | \ static inline u32 WPA_GET_BE32(const u8 *a)
(((u64) (a)[5]) << 40) | (((u64) (a)[4]) << 32) | \ {
(((u64) (a)[3]) << 24) | (((u64) (a)[2]) << 16) | \ return (a[0] << 24) | (a[1] << 16) | (a[2] << 8) | a[3];
(((u64) (a)[1]) << 8) | ((u64) (a)[0])) }
static inline void WPA_PUT_BE32(u8 *a, u32 val)
{
a[0] = (val >> 24) & 0xff;
a[1] = (val >> 16) & 0xff;
a[2] = (val >> 8) & 0xff;
a[3] = val & 0xff;
}
static inline u32 WPA_GET_LE32(const u8 *a)
{
return (a[3] << 24) | (a[2] << 16) | (a[1] << 8) | a[0];
}
static inline void WPA_PUT_LE32(u8 *a, u32 val)
{
a[3] = (val >> 24) & 0xff;
a[2] = (val >> 16) & 0xff;
a[1] = (val >> 8) & 0xff;
a[0] = val & 0xff;
}
static inline u64 WPA_GET_BE64(const u8 *a)
{
return (((u64) a[0]) << 56) | (((u64) a[1]) << 48) |
(((u64) a[2]) << 40) | (((u64) a[3]) << 32) |
(((u64) a[4]) << 24) | (((u64) a[5]) << 16) |
(((u64) a[6]) << 8) | ((u64) a[7]);
}
static inline void WPA_PUT_BE64(u8 *a, u64 val)
{
a[0] = val >> 56;
a[1] = val >> 48;
a[2] = val >> 40;
a[3] = val >> 32;
a[4] = val >> 24;
a[5] = val >> 16;
a[6] = val >> 8;
a[7] = val & 0xff;
}
static inline u64 WPA_GET_LE64(const u8 *a)
{
return (((u64) a[7]) << 56) | (((u64) a[6]) << 48) |
(((u64) a[5]) << 40) | (((u64) a[4]) << 32) |
(((u64) a[3]) << 24) | (((u64) a[2]) << 16) |
(((u64) a[1]) << 8) | ((u64) a[0]);
}
static inline void WPA_PUT_LE64(u8 *a, u64 val)
{
a[7] = val >> 56;
a[6] = val >> 48;
a[5] = val >> 40;
a[4] = val >> 32;
a[3] = val >> 24;
a[2] = val >> 16;
a[1] = val >> 8;
a[0] = val & 0xff;
}
#ifndef ETH_ALEN #ifndef ETH_ALEN