eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a union instead of casts

Browse source 
Same intended semantics, no casts.

Limitation: this doesn't work on architectures where
sizeof(uintptr_t) < sizeof(void*), which is somewhat weird but possible if
pointers contain redundant information.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2022-02-12 00:20:08 +01:00
parent 1e265d2e68
commit ded2a42ac1
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
include/mbedtls/ssl.h
View file

@ -1218,6 +1218,18 @@ typedef void mbedtls_ssl_export_keys_t( void *p_expkey,
const unsigned char server_random[32], const unsigned char server_random[32],
mbedtls_tls_prf_types tls_prf_type ); mbedtls_tls_prf_types tls_prf_type );
/* A type for storing user data in a library structure.
*
* The representation of type may change in future versions of the library.
* Only the behaviors guaranteed by documented accessor functions are
* guaranteed to remain stable.
*/
typedef union
{
uintptr_t n; /* typically a handle to an associated object */
void *p; /* typically a pointer to extra data */
} mbedtls_ssl_user_data_t;
/** /**
* SSL/TLS configuration to be shared between mbedtls_ssl_context structures. * SSL/TLS configuration to be shared between mbedtls_ssl_context structures.
*/ */
@ -1462,7 +1474,7 @@ struct mbedtls_ssl_config
* The library sets this to \p 0 when creating a context and does not * The library sets this to \p 0 when creating a context and does not
* access it afterwards. * access it afterwards.
*/ */
uintptr_t MBEDTLS_PRIVATE(user_data); mbedtls_ssl_user_data_t MBEDTLS_PRIVATE(user_data);
}; };
struct mbedtls_ssl_context struct mbedtls_ssl_context
@ -1694,7 +1706,7 @@ struct mbedtls_ssl_context
* mbedtls_ssl_context_save() and mbedtls_ssl_context_load() * mbedtls_ssl_context_save() and mbedtls_ssl_context_load()
* does not currently restore the user data. * does not currently restore the user data.
*/ */
uintptr_t MBEDTLS_PRIVATE(user_data); mbedtls_ssl_user_data_t MBEDTLS_PRIVATE(user_data);
}; };
/** /**
@ -2319,7 +2331,7 @@ static inline void mbedtls_ssl_conf_set_user_data_p(
mbedtls_ssl_config *conf, mbedtls_ssl_config *conf,
void *p ) void *p )
{ {
conf->MBEDTLS_PRIVATE(user_data) = (uintptr_t) p; conf->MBEDTLS_PRIVATE(user_data).p = p;
} }
/** \brief Set the user data in an SSL configuration to an integer. /** \brief Set the user data in an SSL configuration to an integer.
@ -2333,7 +2345,7 @@ static inline void mbedtls_ssl_conf_set_user_data_n(
mbedtls_ssl_config *conf, mbedtls_ssl_config *conf,
uintptr_t n ) uintptr_t n )
{ {
conf->MBEDTLS_PRIVATE(user_data) = n; conf->MBEDTLS_PRIVATE(user_data).n = n;
} }
/** \brief Retrieve the user data in an SSL configuration as a pointer. /** \brief Retrieve the user data in an SSL configuration as a pointer.
@ -2349,7 +2361,7 @@ static inline void mbedtls_ssl_conf_set_user_data_n(
static inline void *mbedtls_ssl_conf_get_user_data_p( static inline void *mbedtls_ssl_conf_get_user_data_p(
mbedtls_ssl_config *conf ) mbedtls_ssl_config *conf )
{ {
return( (void*) conf->MBEDTLS_PRIVATE(user_data) ); return( conf->MBEDTLS_PRIVATE(user_data).p );
} }
/** \brief Retrieve the user data in an SSL configuration as an integer. /** \brief Retrieve the user data in an SSL configuration as an integer.
@ -2365,7 +2377,7 @@ static inline void *mbedtls_ssl_conf_get_user_data_p(
static inline uintptr_t mbedtls_ssl_conf_get_user_data_n( static inline uintptr_t mbedtls_ssl_conf_get_user_data_n(
mbedtls_ssl_config *conf ) mbedtls_ssl_config *conf )
{ {
return( conf->MBEDTLS_PRIVATE(user_data) ); return( conf->MBEDTLS_PRIVATE(user_data).n );
} }
/** \brief Set the user data in an SSL context to a pointer. /** \brief Set the user data in an SSL context to a pointer.
@ -2382,7 +2394,7 @@ static inline void mbedtls_ssl_set_user_data_p(
mbedtls_ssl_context *ssl, mbedtls_ssl_context *ssl,
void *p ) void *p )
{ {
ssl->MBEDTLS_PRIVATE(user_data) = (uintptr_t) p; ssl->MBEDTLS_PRIVATE(user_data).p = p;
} }
/** \brief Set the user data in an SSL context to an integer. /** \brief Set the user data in an SSL context to an integer.
@ -2396,7 +2408,7 @@ static inline void mbedtls_ssl_set_user_data_n(
mbedtls_ssl_context *ssl, mbedtls_ssl_context *ssl,
uintptr_t n ) uintptr_t n )
{ {
ssl->MBEDTLS_PRIVATE(user_data) = n; ssl->MBEDTLS_PRIVATE(user_data).n = n;
} }
/** \brief Retrieve the user data in an SSL context as a pointer. /** \brief Retrieve the user data in an SSL context as a pointer.
@ -2412,7 +2424,7 @@ static inline void mbedtls_ssl_set_user_data_n(
static inline void *mbedtls_ssl_get_user_data_p( static inline void *mbedtls_ssl_get_user_data_p(
mbedtls_ssl_context *ssl ) mbedtls_ssl_context *ssl )
{ {
return( (void*) ssl->MBEDTLS_PRIVATE(user_data) ); return( ssl->MBEDTLS_PRIVATE(user_data).p );
} }
/** \brief Retrieve the user data in an SSL context as an integer. /** \brief Retrieve the user data in an SSL context as an integer.
@ -2428,7 +2440,7 @@ static inline void *mbedtls_ssl_get_user_data_p(
static inline uintptr_t mbedtls_ssl_get_user_data_n( static inline uintptr_t mbedtls_ssl_get_user_data_n(
mbedtls_ssl_context *ssl ) mbedtls_ssl_context *ssl )
{ {
return( ssl->MBEDTLS_PRIVATE(user_data) ); return( ssl->MBEDTLS_PRIVATE(user_data).n );
} }
#if defined(MBEDTLS_SSL_ASYNC_PRIVATE) #if defined(MBEDTLS_SSL_ASYNC_PRIVATE)