Whitespace
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
parent
e47899df20
commit
914c632646
1 changed files with 43 additions and 43 deletions
|
@ -130,7 +130,7 @@ inline void mbedtls_put_unaligned_uint64(void *p, uint64_t x)
|
||||||
* byte from x, where byte 0 is the least significant byte.
|
* byte from x, where byte 0 is the least significant byte.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_BYTE_0(x) ((uint8_t) ((x) & 0xff))
|
#define MBEDTLS_BYTE_0(x) ((uint8_t) ((x) & 0xff))
|
||||||
#define MBEDTLS_BYTE_1(x) ((uint8_t) (((x) >> 8) & 0xff))
|
#define MBEDTLS_BYTE_1(x) ((uint8_t) (((x) >> 8) & 0xff))
|
||||||
#define MBEDTLS_BYTE_2(x) ((uint8_t) (((x) >> 16) & 0xff))
|
#define MBEDTLS_BYTE_2(x) ((uint8_t) (((x) >> 16) & 0xff))
|
||||||
#define MBEDTLS_BYTE_3(x) ((uint8_t) (((x) >> 24) & 0xff))
|
#define MBEDTLS_BYTE_3(x) ((uint8_t) (((x) >> 24) & 0xff))
|
||||||
#define MBEDTLS_BYTE_4(x) ((uint8_t) (((x) >> 32) & 0xff))
|
#define MBEDTLS_BYTE_4(x) ((uint8_t) (((x) >> 32) & 0xff))
|
||||||
|
@ -245,8 +245,8 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* byte of the four bytes to build the 32 bits unsigned
|
* byte of the four bytes to build the 32 bits unsigned
|
||||||
* integer from.
|
* integer from.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_GET_UINT32_BE(data, offset) \
|
#define MBEDTLS_GET_UINT32_BE(data, offset) \
|
||||||
((MBEDTLS_IS_BIG_ENDIAN) \
|
((MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
? mbedtls_get_unaligned_uint32((data) + (offset)) \
|
? mbedtls_get_unaligned_uint32((data) + (offset)) \
|
||||||
: MBEDTLS_BSWAP32(mbedtls_get_unaligned_uint32((data) + (offset))) \
|
: MBEDTLS_BSWAP32(mbedtls_get_unaligned_uint32((data) + (offset))) \
|
||||||
)
|
)
|
||||||
|
@ -260,11 +260,11 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* \param offset Offset from \p data where to put the most significant
|
* \param offset Offset from \p data where to put the most significant
|
||||||
* byte of the 32 bits unsigned integer \p n.
|
* byte of the 32 bits unsigned integer \p n.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PUT_UINT32_BE(n, data, offset) \
|
#define MBEDTLS_PUT_UINT32_BE(n, data, offset) \
|
||||||
{ \
|
{ \
|
||||||
if (MBEDTLS_IS_BIG_ENDIAN) \
|
if (MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
{ \
|
{ \
|
||||||
mbedtls_put_unaligned_uint32((data) + (offset), (uint32_t) (n)); \
|
mbedtls_put_unaligned_uint32((data) + (offset), (uint32_t) (n)); \
|
||||||
} \
|
} \
|
||||||
else \
|
else \
|
||||||
{ \
|
{ \
|
||||||
|
@ -281,8 +281,8 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* byte of the four bytes to build the 32 bits unsigned
|
* byte of the four bytes to build the 32 bits unsigned
|
||||||
* integer from.
|
* integer from.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_GET_UINT32_LE(data, offset) \
|
#define MBEDTLS_GET_UINT32_LE(data, offset) \
|
||||||
((MBEDTLS_IS_BIG_ENDIAN) \
|
((MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
? MBEDTLS_BSWAP32(mbedtls_get_unaligned_uint32((data) + (offset))) \
|
? MBEDTLS_BSWAP32(mbedtls_get_unaligned_uint32((data) + (offset))) \
|
||||||
: mbedtls_get_unaligned_uint32((data) + (offset)) \
|
: mbedtls_get_unaligned_uint32((data) + (offset)) \
|
||||||
)
|
)
|
||||||
|
@ -297,15 +297,15 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* \param offset Offset from \p data where to put the least significant
|
* \param offset Offset from \p data where to put the least significant
|
||||||
* byte of the 32 bits unsigned integer \p n.
|
* byte of the 32 bits unsigned integer \p n.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PUT_UINT32_LE(n, data, offset) \
|
#define MBEDTLS_PUT_UINT32_LE(n, data, offset) \
|
||||||
{ \
|
{ \
|
||||||
if (MBEDTLS_IS_BIG_ENDIAN) \
|
if (MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
{ \
|
{ \
|
||||||
mbedtls_put_unaligned_uint32((data) + (offset), MBEDTLS_BSWAP32((uint32_t) (n))); \
|
mbedtls_put_unaligned_uint32((data) + (offset), MBEDTLS_BSWAP32((uint32_t) (n))); \
|
||||||
} \
|
} \
|
||||||
else \
|
else \
|
||||||
{ \
|
{ \
|
||||||
mbedtls_put_unaligned_uint32((data) + (offset), ((uint32_t) (n))); \
|
mbedtls_put_unaligned_uint32((data) + (offset), ((uint32_t) (n))); \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -318,8 +318,8 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* byte of the two bytes to build the 16 bits unsigned
|
* byte of the two bytes to build the 16 bits unsigned
|
||||||
* integer from.
|
* integer from.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_GET_UINT16_LE(data, offset) \
|
#define MBEDTLS_GET_UINT16_LE(data, offset) \
|
||||||
((MBEDTLS_IS_BIG_ENDIAN) \
|
((MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
? MBEDTLS_BSWAP16(mbedtls_get_unaligned_uint16((data) + (offset))) \
|
? MBEDTLS_BSWAP16(mbedtls_get_unaligned_uint16((data) + (offset))) \
|
||||||
: mbedtls_get_unaligned_uint16((data) + (offset)) \
|
: mbedtls_get_unaligned_uint16((data) + (offset)) \
|
||||||
)
|
)
|
||||||
|
@ -333,15 +333,15 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* \param offset Offset from \p data where to put the least significant
|
* \param offset Offset from \p data where to put the least significant
|
||||||
* byte of the 16 bits unsigned integer \p n.
|
* byte of the 16 bits unsigned integer \p n.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PUT_UINT16_LE(n, data, offset) \
|
#define MBEDTLS_PUT_UINT16_LE(n, data, offset) \
|
||||||
{ \
|
{ \
|
||||||
if (MBEDTLS_IS_BIG_ENDIAN) \
|
if (MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
{ \
|
{ \
|
||||||
mbedtls_put_unaligned_uint16((data) + (offset), MBEDTLS_BSWAP16((uint16_t) (n))); \
|
mbedtls_put_unaligned_uint16((data) + (offset), MBEDTLS_BSWAP16((uint16_t) (n))); \
|
||||||
} \
|
} \
|
||||||
else \
|
else \
|
||||||
{ \
|
{ \
|
||||||
mbedtls_put_unaligned_uint16((data) + (offset), (uint16_t) (n)); \
|
mbedtls_put_unaligned_uint16((data) + (offset), (uint16_t) (n)); \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -354,8 +354,8 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* byte of the two bytes to build the 16 bits unsigned
|
* byte of the two bytes to build the 16 bits unsigned
|
||||||
* integer from.
|
* integer from.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_GET_UINT16_BE(data, offset) \
|
#define MBEDTLS_GET_UINT16_BE(data, offset) \
|
||||||
((MBEDTLS_IS_BIG_ENDIAN) \
|
((MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
? mbedtls_get_unaligned_uint16((data) + (offset)) \
|
? mbedtls_get_unaligned_uint16((data) + (offset)) \
|
||||||
: MBEDTLS_BSWAP16(mbedtls_get_unaligned_uint16((data) + (offset))) \
|
: MBEDTLS_BSWAP16(mbedtls_get_unaligned_uint16((data) + (offset))) \
|
||||||
)
|
)
|
||||||
|
@ -369,11 +369,11 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* \param offset Offset from \p data where to put the most significant
|
* \param offset Offset from \p data where to put the most significant
|
||||||
* byte of the 16 bits unsigned integer \p n.
|
* byte of the 16 bits unsigned integer \p n.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PUT_UINT16_BE(n, data, offset) \
|
#define MBEDTLS_PUT_UINT16_BE(n, data, offset) \
|
||||||
{ \
|
{ \
|
||||||
if (MBEDTLS_IS_BIG_ENDIAN) \
|
if (MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
{ \
|
{ \
|
||||||
mbedtls_put_unaligned_uint16((data) + (offset), (uint16_t) (n)); \
|
mbedtls_put_unaligned_uint16((data) + (offset), (uint16_t) (n)); \
|
||||||
} \
|
} \
|
||||||
else \
|
else \
|
||||||
{ \
|
{ \
|
||||||
|
@ -390,11 +390,11 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* byte of the three bytes to build the 24 bits unsigned
|
* byte of the three bytes to build the 24 bits unsigned
|
||||||
* integer from.
|
* integer from.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_GET_UINT24_BE(data, offset) \
|
#define MBEDTLS_GET_UINT24_BE(data, offset) \
|
||||||
( \
|
( \
|
||||||
((uint32_t) (data)[(offset)] << 16) \
|
((uint32_t) (data)[(offset)] << 16) \
|
||||||
| ((uint32_t) (data)[(offset) + 1] << 8) \
|
| ((uint32_t) (data)[(offset) + 1] << 8) \
|
||||||
| ((uint32_t) (data)[(offset) + 2]) \
|
| ((uint32_t) (data)[(offset) + 2]) \
|
||||||
)
|
)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -407,8 +407,8 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* byte of the 24 bits unsigned integer \p n.
|
* byte of the 24 bits unsigned integer \p n.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PUT_UINT24_BE(n, data, offset) \
|
#define MBEDTLS_PUT_UINT24_BE(n, data, offset) \
|
||||||
{ \
|
{ \
|
||||||
(data)[(offset)] = MBEDTLS_BYTE_2(n); \
|
(data)[(offset)] = MBEDTLS_BYTE_2(n); \
|
||||||
(data)[(offset) + 1] = MBEDTLS_BYTE_1(n); \
|
(data)[(offset) + 1] = MBEDTLS_BYTE_1(n); \
|
||||||
(data)[(offset) + 2] = MBEDTLS_BYTE_0(n); \
|
(data)[(offset) + 2] = MBEDTLS_BYTE_0(n); \
|
||||||
}
|
}
|
||||||
|
@ -422,9 +422,9 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* byte of the three bytes to build the 24 bits unsigned
|
* byte of the three bytes to build the 24 bits unsigned
|
||||||
* integer from.
|
* integer from.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_GET_UINT24_LE(data, offset) \
|
#define MBEDTLS_GET_UINT24_LE(data, offset) \
|
||||||
( \
|
( \
|
||||||
((uint32_t) (data)[(offset)]) \
|
((uint32_t) (data)[(offset)]) \
|
||||||
| ((uint32_t) (data)[(offset) + 1] << 8) \
|
| ((uint32_t) (data)[(offset) + 1] << 8) \
|
||||||
| ((uint32_t) (data)[(offset) + 2] << 16) \
|
| ((uint32_t) (data)[(offset) + 2] << 16) \
|
||||||
)
|
)
|
||||||
|
@ -439,8 +439,8 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* byte of the 24 bits unsigned integer \p n.
|
* byte of the 24 bits unsigned integer \p n.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PUT_UINT24_LE(n, data, offset) \
|
#define MBEDTLS_PUT_UINT24_LE(n, data, offset) \
|
||||||
{ \
|
{ \
|
||||||
(data)[(offset)] = MBEDTLS_BYTE_0(n); \
|
(data)[(offset)] = MBEDTLS_BYTE_0(n); \
|
||||||
(data)[(offset) + 1] = MBEDTLS_BYTE_1(n); \
|
(data)[(offset) + 1] = MBEDTLS_BYTE_1(n); \
|
||||||
(data)[(offset) + 2] = MBEDTLS_BYTE_2(n); \
|
(data)[(offset) + 2] = MBEDTLS_BYTE_2(n); \
|
||||||
}
|
}
|
||||||
|
@ -454,8 +454,8 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* byte of the eight bytes to build the 64 bits unsigned
|
* byte of the eight bytes to build the 64 bits unsigned
|
||||||
* integer from.
|
* integer from.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_GET_UINT64_BE(data, offset) \
|
#define MBEDTLS_GET_UINT64_BE(data, offset) \
|
||||||
((MBEDTLS_IS_BIG_ENDIAN) \
|
((MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
? mbedtls_get_unaligned_uint64((data) + (offset)) \
|
? mbedtls_get_unaligned_uint64((data) + (offset)) \
|
||||||
: MBEDTLS_BSWAP64(mbedtls_get_unaligned_uint64((data) + (offset))) \
|
: MBEDTLS_BSWAP64(mbedtls_get_unaligned_uint64((data) + (offset))) \
|
||||||
)
|
)
|
||||||
|
@ -469,11 +469,11 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* \param offset Offset from \p data where to put the most significant
|
* \param offset Offset from \p data where to put the most significant
|
||||||
* byte of the 64 bits unsigned integer \p n.
|
* byte of the 64 bits unsigned integer \p n.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PUT_UINT64_BE(n, data, offset) \
|
#define MBEDTLS_PUT_UINT64_BE(n, data, offset) \
|
||||||
{ \
|
{ \
|
||||||
if (MBEDTLS_IS_BIG_ENDIAN) \
|
if (MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
{ \
|
{ \
|
||||||
mbedtls_put_unaligned_uint64((data) + (offset), (uint64_t) (n)); \
|
mbedtls_put_unaligned_uint64((data) + (offset), (uint64_t) (n)); \
|
||||||
} \
|
} \
|
||||||
else \
|
else \
|
||||||
{ \
|
{ \
|
||||||
|
@ -490,8 +490,8 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* byte of the eight bytes to build the 64 bits unsigned
|
* byte of the eight bytes to build the 64 bits unsigned
|
||||||
* integer from.
|
* integer from.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_GET_UINT64_LE(data, offset) \
|
#define MBEDTLS_GET_UINT64_LE(data, offset) \
|
||||||
((MBEDTLS_IS_BIG_ENDIAN) \
|
((MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
? MBEDTLS_BSWAP64(mbedtls_get_unaligned_uint64((data) + (offset))) \
|
? MBEDTLS_BSWAP64(mbedtls_get_unaligned_uint64((data) + (offset))) \
|
||||||
: mbedtls_get_unaligned_uint64((data) + (offset)) \
|
: mbedtls_get_unaligned_uint64((data) + (offset)) \
|
||||||
)
|
)
|
||||||
|
@ -505,15 +505,15 @@ static const uint16_t mbedtls_byte_order_detector = { 0x100 };
|
||||||
* \param offset Offset from \p data where to put the least significant
|
* \param offset Offset from \p data where to put the least significant
|
||||||
* byte of the 64 bits unsigned integer \p n.
|
* byte of the 64 bits unsigned integer \p n.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PUT_UINT64_LE(n, data, offset) \
|
#define MBEDTLS_PUT_UINT64_LE(n, data, offset) \
|
||||||
{ \
|
{ \
|
||||||
if (MBEDTLS_IS_BIG_ENDIAN) \
|
if (MBEDTLS_IS_BIG_ENDIAN) \
|
||||||
{ \
|
{ \
|
||||||
mbedtls_put_unaligned_uint64((data) + (offset), MBEDTLS_BSWAP64((uint64_t) (n))); \
|
mbedtls_put_unaligned_uint64((data) + (offset), MBEDTLS_BSWAP64((uint64_t) (n))); \
|
||||||
} \
|
} \
|
||||||
else \
|
else \
|
||||||
{ \
|
{ \
|
||||||
mbedtls_put_unaligned_uint64((data) + (offset), (uint64_t) (n)); \
|
mbedtls_put_unaligned_uint64((data) + (offset), (uint64_t) (n)); \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue