lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Improve consitency throughout library/common.h

Browse Source 
Replace the contents of MBEDTLS_PUT_UINTx_yz contained inconsitent
but similar/duplicate code to the MBEDTLS_BYTE_x macros. Therefore
the contents of the macros now utilise the byte reading macros.

MBEDTLS_PUT_UINT64_LE's written order was also not consitent with
the other PUT macros, so that was modified.

Documentation comment said LSB instead of MSB and that has also been
resolved.

Signed-off-by: Joe Subbiani <joe.subbiani@arm.com>
This commit is contained in:
Joe Subbiani
2021-07-19 15:29:18 +01:00
parent 6dd7364553
commit 5241e343de
1 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
library/common.h
View File

@ -113,12 +113,12 @@ extern void (*mbedtls_test_hook_test_fail)( const char * test, int line, const c
*/
#ifndef MBEDTLS_PUT_UINT32_BE
#define MBEDTLS_PUT_UINT32_BE( n, data, offset ) \
do { \
( data )[( offset ) ] = (unsigned char) ( (n) >> 24 ); \
( data )[( offset ) + 1] = (unsigned char) ( (n) >> 16 ); \
( data )[( offset ) + 2] = (unsigned char) ( (n) >> 8 ); \
( data )[( offset ) + 3] = (unsigned char) ( (n) ); \
} while( 0 )
{ \
( data )[( offset ) ] = MBEDTLS_BYTE_3( n ); \
( data )[( offset ) + 1] = MBEDTLS_BYTE_2( n ); \
( data )[( offset ) + 2] = MBEDTLS_BYTE_1( n ); \
( data )[( offset ) + 3] = MBEDTLS_BYTE_0( n ); \
}
#endif
/**
@ -151,12 +151,12 @@ extern void (*mbedtls_test_hook_test_fail)( const char * test, int line, const c
*/
#ifndef MBEDTLS_PUT_UINT32_LE
#define MBEDTLS_PUT_UINT32_LE( n, data, offset ) \
do { \
( data )[( offset ) ] = (unsigned char) ( ( (n) ) & 0xFF ); \
( data )[( offset ) + 1] = (unsigned char) ( ( (n) >> 8 ) & 0xFF ); \
( data )[( offset ) + 2] = (unsigned char) ( ( (n) >> 16 ) & 0xFF ); \
( data )[( offset ) + 3] = (unsigned char) ( ( (n) >> 24 ) & 0xFF ); \
} while( 0 )
{ \
( data )[( offset ) ] = MBEDTLS_BYTE_0( n ); \
( data )[( offset ) + 1] = MBEDTLS_BYTE_1( n ); \
( data )[( offset ) + 2] = MBEDTLS_BYTE_2( n ); \
( data )[( offset ) + 3] = MBEDTLS_BYTE_3( n ); \
}
#endif
/**
@ -188,14 +188,14 @@ extern void (*mbedtls_test_hook_test_fail)( const char * test, int line, const c
#ifndef MBEDTLS_PUT_UINT16_LE
#define MBEDTLS_PUT_UINT16_LE( n, data, offset ) \
{ \
( data )[( offset ) ] = (unsigned char) ( ( (n) ) & 0xFF ); \
( data )[( offset ) + 1] = (unsigned char) ( ( (n) >> 8 ) & 0xFF ); \
( data )[( offset ) ] = MBEDTLS_BYTE_0( n ); \
( data )[( offset ) + 1] = MBEDTLS_BYTE_1( n ); \
}
#endif
/**
* Get the unsigned 16 bits integer corresponding to two bytes in
* big-endian order (LSB first).
* big-endian order (MSB first).
*
* \param data Base address of the memory to get the two bytes from.
* \param offset Offset from \p base of the first and most significant
@ -222,8 +222,8 @@ extern void (*mbedtls_test_hook_test_fail)( const char * test, int line, const c
#ifndef MBEDTLS_PUT_UINT16_BE
#define MBEDTLS_PUT_UINT16_BE( n, data, offset ) \
{ \
( data )[( offset ) ] = (unsigned char) ( ( (n) >> 8 ) & 0xFF ); \
( data )[( offset ) + 1] = (unsigned char) ( ( (n) ) & 0xFF ); \
( data )[( offset ) ] = MBEDTLS_BYTE_1( n ); \
( data )[( offset ) + 1] = MBEDTLS_BYTE_0( n ); \
}
#endif
@ -262,14 +262,14 @@ extern void (*mbedtls_test_hook_test_fail)( const char * test, int line, const c
#ifndef MBEDTLS_PUT_UINT64_BE
#define MBEDTLS_PUT_UINT64_BE( n, data, offset ) \
{ \
( data )[( offset ) ] = (unsigned char) ( (n) >> 56 ); \
( data )[( offset ) + 1] = (unsigned char) ( (n) >> 48 ); \
( data )[( offset ) + 2] = (unsigned char) ( (n) >> 40 ); \
( data )[( offset ) + 3] = (unsigned char) ( (n) >> 32 ); \
( data )[( offset ) + 4] = (unsigned char) ( (n) >> 24 ); \
( data )[( offset ) + 5] = (unsigned char) ( (n) >> 16 ); \
( data )[( offset ) + 6] = (unsigned char) ( (n) >> 8 ); \
( data )[( offset ) + 7] = (unsigned char) ( (n) ); \
( data )[( offset ) ] = MBEDTLS_BYTE_7( n ); \
( data )[( offset ) + 1] = MBEDTLS_BYTE_6( n ); \
( data )[( offset ) + 2] = MBEDTLS_BYTE_5( n ); \
( data )[( offset ) + 3] = MBEDTLS_BYTE_4( n ); \
( data )[( offset ) + 4] = MBEDTLS_BYTE_3( n ); \
( data )[( offset ) + 5] = MBEDTLS_BYTE_2( n ); \
( data )[( offset ) + 6] = MBEDTLS_BYTE_1( n ); \
( data )[( offset ) + 7] = MBEDTLS_BYTE_0( n ); \
}
#endif
@ -308,14 +308,14 @@ extern void (*mbedtls_test_hook_test_fail)( const char * test, int line, const c
#ifndef MBEDTLS_PUT_UINT64_LE
#define MBEDTLS_PUT_UINT64_LE( n, data, offset ) \
{ \
( data )[( offset ) + 7] = (unsigned char) ( (n) >> 56 ); \
( data )[( offset ) + 6] = (unsigned char) ( (n) >> 48 ); \
( data )[( offset ) + 5] = (unsigned char) ( (n) >> 40 ); \
( data )[( offset ) + 4] = (unsigned char) ( (n) >> 32 ); \
( data )[( offset ) + 3] = (unsigned char) ( (n) >> 24 ); \
( data )[( offset ) + 2] = (unsigned char) ( (n) >> 16 ); \
( data )[( offset ) + 1] = (unsigned char) ( (n) >> 8 ); \
( data )[( offset ) ] = (unsigned char) ( (n) ); \
( data )[( offset ) ] = MBEDTLS_BYTE_0( n ); \
( data )[( offset ) + 1] = MBEDTLS_BYTE_1( n ); \
( data )[( offset ) + 2] = MBEDTLS_BYTE_2( n ); \
( data )[( offset ) + 3] = MBEDTLS_BYTE_3( n ); \
( data )[( offset ) + 4] = MBEDTLS_BYTE_4( n ); \
( data )[( offset ) + 5] = MBEDTLS_BYTE_5( n ); \
( data )[( offset ) + 6] = MBEDTLS_BYTE_6( n ); \
( data )[( offset ) + 7] = MBEDTLS_BYTE_7( n ); \
}
#endif