lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Switch to the new code style

Browse Source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine
2023-01-11 14:52:35 +01:00
parent 480f683d15
commit 1b6c09a62e
391 changed files with 73134 additions and 75084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
scripts/data_files/error.fmt
View File

@ -32,115 +32,120 @@
HEADER_INCLUDED
const char * mbedtls_high_level_strerr( int error_code )
const char *mbedtls_high_level_strerr(int error_code)
{
int high_level_error_code;
if( error_code < 0 )
if (error_code < 0) {
error_code = -error_code;
}
/* Extract the high-level part from the error code. */
high_level_error_code = error_code & 0xFF80;
switch( high_level_error_code )
{
/* Begin Auto-Generated Code. */
HIGH_LEVEL_CODE_CHECKS
switch (high_level_error_code) {
/* Begin Auto-Generated Code. */
HIGH_LEVEL_CODE_CHECKS
/* End Auto-Generated Code. */
default:
break;
}
return( NULL );
return NULL;
}
const char * mbedtls_low_level_strerr( int error_code )
const char *mbedtls_low_level_strerr(int error_code)
{
int low_level_error_code;
if( error_code < 0 )
if (error_code < 0) {
error_code = -error_code;
}
/* Extract the low-level part from the error code. */
low_level_error_code = error_code & ~0xFF80;
switch( low_level_error_code )
{
/* Begin Auto-Generated Code. */
LOW_LEVEL_CODE_CHECKS
switch (low_level_error_code) {
/* Begin Auto-Generated Code. */
LOW_LEVEL_CODE_CHECKS
/* End Auto-Generated Code. */
default:
break;
}
return( NULL );
return NULL;
}
void mbedtls_strerror( int ret, char *buf, size_t buflen )
void mbedtls_strerror(int ret, char *buf, size_t buflen)
{
size_t len;
int use_ret;
const char * high_level_error_description = NULL;
const char * low_level_error_description = NULL;
const char *high_level_error_description = NULL;
const char *low_level_error_description = NULL;
if( buflen == 0 )
if (buflen == 0) {
return;
}
memset( buf, 0x00, buflen );
memset(buf, 0x00, buflen);
if( ret < 0 )
if (ret < 0) {
ret = -ret;
}
if( ret & 0xFF80 )
{
if (ret & 0xFF80) {
use_ret = ret & 0xFF80;
// Translate high level error code.
high_level_error_description = mbedtls_high_level_strerr( ret );
high_level_error_description = mbedtls_high_level_strerr(ret);
if( high_level_error_description == NULL )
mbedtls_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", (unsigned int) use_ret );
else
mbedtls_snprintf( buf, buflen, "%s", high_level_error_description );
if (high_level_error_description == NULL) {
mbedtls_snprintf(buf, buflen, "UNKNOWN ERROR CODE (%04X)", (unsigned int) use_ret);
} else {
mbedtls_snprintf(buf, buflen, "%s", high_level_error_description);
}
#if defined(MBEDTLS_SSL_TLS_C)
// Early return in case of a fatal error - do not try to translate low
// level code.
if(use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE))
if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
return;
}
#endif /* MBEDTLS_SSL_TLS_C */
}
use_ret = ret & ~0xFF80;
if( use_ret == 0 )
if (use_ret == 0) {
return;
}
// If high level code is present, make a concatenation between both
// error strings.
//
len = strlen( buf );
len = strlen(buf);
if( len > 0 )
{
if( buflen - len < 5 )
if (len > 0) {
if (buflen - len < 5) {
return;
}
mbedtls_snprintf( buf + len, buflen - len, " : " );
mbedtls_snprintf(buf + len, buflen - len, " : ");
buf += len + 3;
buflen -= len + 3;
}
// Translate low level error code.
low_level_error_description = mbedtls_low_level_strerr( ret );
low_level_error_description = mbedtls_low_level_strerr(ret);
if( low_level_error_description == NULL )
mbedtls_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", (unsigned int) use_ret );
else
mbedtls_snprintf( buf, buflen, "%s", low_level_error_description );
if (low_level_error_description == NULL) {
mbedtls_snprintf(buf, buflen, "UNKNOWN ERROR CODE (%04X)", (unsigned int) use_ret);
} else {
mbedtls_snprintf(buf, buflen, "%s", low_level_error_description);
}
}
#else /* MBEDTLS_ERROR_C */
@ -148,18 +153,19 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen )
/*
* Provide a dummy implementation when MBEDTLS_ERROR_C is not defined
*/
void mbedtls_strerror( int ret, char *buf, size_t buflen )
void mbedtls_strerror(int ret, char *buf, size_t buflen)
{
((void) ret);
if( buflen > 0 )
if (buflen > 0) {
buf[0] = '\0';
}
}
#endif /* MBEDTLS_ERROR_C */
#if defined(MBEDTLS_TEST_HOOKS)
void (*mbedtls_test_hook_error_add)( int, int, const char *, int );
void (*mbedtls_test_hook_error_add)(int, int, const char *, int);
#endif
#endif /* MBEDTLS_ERROR_C || MBEDTLS_ERROR_STRERROR_DUMMY */

13
scripts/data_files/query_config.fmt
View File

@ -110,11 +110,12 @@
*/
#define MACRO_EXPANSION_TO_STR(macro) MACRO_NAME_TO_STR(macro)
#define MACRO_NAME_TO_STR(macro) \
mbedtls_printf( "%s", strlen( #macro "" ) > 0 ? #macro "\n" : "" )
mbedtls_printf("%s", strlen( #macro "") > 0 ? #macro "\n" : "")
#define STRINGIFY(macro) #macro
#define OUTPUT_MACRO_NAME_VALUE(macro) mbedtls_printf( #macro "%s\n", \
( STRINGIFY(macro) "" )[0] != 0 ? "=" STRINGIFY(macro) : "" )
(STRINGIFY(macro) "")[0] != 0 ? "=" STRINGIFY( \
macro) : "")
#if defined(_MSC_VER)
/*
@ -129,13 +130,13 @@
#pragma warning(disable:4003)
#endif /* _MSC_VER */
int query_config( const char *config )
int query_config(const char *config)
{
CHECK_CONFIG /* If the symbol is not found, return an error */
return( 1 );
CHECK_CONFIG /* If the symbol is not found, return an error */
return 1;
}
void list_config( void )
void list_config(void)
{
LIST_CONFIG
}

24
scripts/data_files/version_features.fmt
View File

@ -27,28 +27,30 @@
static const char * const features[] = {
#if defined(MBEDTLS_VERSION_FEATURES)
FEATURE_DEFINES
FEATURE_DEFINES
#endif /* MBEDTLS_VERSION_FEATURES */
NULL
};
int mbedtls_version_check_feature( const char *feature )
int mbedtls_version_check_feature(const char *feature)
{
const char * const *idx = features;
if( *idx == NULL )
return( -2 );
if (*idx == NULL) {
return -2;
}
if( feature == NULL )
return( -1 );
if (feature == NULL) {
return -1;
}
while( *idx != NULL )
{
if( !strcmp( *idx, feature ) )
return( 0 );
while (*idx != NULL) {
if (!strcmp(*idx, feature)) {
return 0;
}
idx++;
}
return( -1 );
return -1;
}
#endif /* MBEDTLS_VERSION_C */