espressif/mbedtls
1
0
Fork 0
mirror of https://github.com/espressif/mbedtls.git synced 2025-06-24 17:20:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update generated files

Browse Source 
Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2023-01-11 14:52:37 +01:00
parent 1b6c09a62e
commit ec03b0431d
3 changed files with 69 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
library/error.c
View File

@ -207,20 +207,20 @@
#endif #endif
const char * mbedtls_high_level_strerr( int error_code ) const char *mbedtls_high_level_strerr(int error_code)
{ {
int high_level_error_code; int high_level_error_code;
if( error_code < 0 ) if (error_code < 0) {
error_code = -error_code; error_code = -error_code;
}
/* Extract the high-level part from the error code. */ /* Extract the high-level part from the error code. */
high_level_error_code = error_code & 0xFF80; high_level_error_code = error_code & 0xFF80;
switch( high_level_error_code ) switch (high_level_error_code) {
{ /* Begin Auto-Generated Code. */
/* Begin Auto-Generated Code. */ #if defined(MBEDTLS_CIPHER_C)
#if defined(MBEDTLS_CIPHER_C)
case -(MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE): case -(MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE):
return( "CIPHER - The selected feature is not available" ); return( "CIPHER - The selected feature is not available" );
case -(MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA): case -(MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA):
@ -568,23 +568,23 @@ const char * mbedtls_high_level_strerr( int error_code )
break; 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; int low_level_error_code;
if( error_code < 0 ) if (error_code < 0) {
error_code = -error_code; error_code = -error_code;
}
/* Extract the low-level part from the error code. */ /* Extract the low-level part from the error code. */
low_level_error_code = error_code & ~0xFF80; low_level_error_code = error_code & ~0xFF80;
switch( low_level_error_code ) switch (low_level_error_code) {
{ /* Begin Auto-Generated Code. */
/* Begin Auto-Generated Code. */ #if defined(MBEDTLS_AES_C)
#if defined(MBEDTLS_AES_C)
case -(MBEDTLS_ERR_AES_INVALID_KEY_LENGTH): case -(MBEDTLS_ERR_AES_INVALID_KEY_LENGTH):
return( "AES - Invalid key length" ); return( "AES - Invalid key length" );
case -(MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH): case -(MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH):
@ -886,72 +886,77 @@ const char * mbedtls_low_level_strerr( int error_code )
break; 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; size_t len;
int use_ret; int use_ret;
const char * high_level_error_description = NULL; const char *high_level_error_description = NULL;
const char * low_level_error_description = NULL; const char *low_level_error_description = NULL;
if( buflen == 0 ) if (buflen == 0) {
return; return;
}
memset( buf, 0x00, buflen ); memset(buf, 0x00, buflen);
if( ret < 0 ) if (ret < 0) {
ret = -ret; ret = -ret;
}
if( ret & 0xFF80 ) if (ret & 0xFF80) {
{
use_ret = ret & 0xFF80; use_ret = ret & 0xFF80;
// Translate high level error code. // 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 ) if (high_level_error_description == NULL) {
mbedtls_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", (unsigned int) use_ret ); mbedtls_snprintf(buf, buflen, "UNKNOWN ERROR CODE (%04X)", (unsigned int) use_ret);
else } else {
mbedtls_snprintf( buf, buflen, "%s", high_level_error_description ); mbedtls_snprintf(buf, buflen, "%s", high_level_error_description);
}
#if defined(MBEDTLS_SSL_TLS_C) #if defined(MBEDTLS_SSL_TLS_C)
// Early return in case of a fatal error - do not try to translate low // Early return in case of a fatal error - do not try to translate low
// level code. // level code.
if(use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
return; return;
}
#endif /* MBEDTLS_SSL_TLS_C */ #endif /* MBEDTLS_SSL_TLS_C */
} }
use_ret = ret & ~0xFF80; use_ret = ret & ~0xFF80;
if( use_ret == 0 ) if (use_ret == 0) {
return; return;
}
// If high level code is present, make a concatenation between both // If high level code is present, make a concatenation between both
// error strings. // error strings.
// //
len = strlen( buf ); len = strlen(buf);
if( len > 0 ) if (len > 0) {
{ if (buflen - len < 5) {
if( buflen - len < 5 )
return; return;
}
mbedtls_snprintf( buf + len, buflen - len, " : " ); mbedtls_snprintf(buf + len, buflen - len, " : ");
buf += len + 3; buf += len + 3;
buflen -= len + 3; buflen -= len + 3;
} }
// Translate low level error code. // 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 ) if (low_level_error_description == NULL) {
mbedtls_snprintf( buf, buflen, "UNKNOWN ERROR CODE (%04X)", (unsigned int) use_ret ); mbedtls_snprintf(buf, buflen, "UNKNOWN ERROR CODE (%04X)", (unsigned int) use_ret);
else } else {
mbedtls_snprintf( buf, buflen, "%s", low_level_error_description ); mbedtls_snprintf(buf, buflen, "%s", low_level_error_description);
}
} }
#else /* MBEDTLS_ERROR_C */ #else /* MBEDTLS_ERROR_C */
@ -959,18 +964,19 @@ void mbedtls_strerror( int ret, char *buf, size_t buflen )
/* /*
* Provide a dummy implementation when MBEDTLS_ERROR_C is not defined * 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); ((void) ret);
if( buflen > 0 ) if (buflen > 0) {
buf[0] = '\0'; buf[0] = '\0';
}
} }
#endif /* MBEDTLS_ERROR_C */ #endif /* MBEDTLS_ERROR_C */
#if defined(MBEDTLS_TEST_HOOKS) #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
#endif /* MBEDTLS_ERROR_C || MBEDTLS_ERROR_STRERROR_DUMMY */ #endif /* MBEDTLS_ERROR_C || MBEDTLS_ERROR_STRERROR_DUMMY */

24
library/version_features.c
View File

@ -27,7 +27,7 @@
static const char * const features[] = { static const char * const features[] = {
#if defined(MBEDTLS_VERSION_FEATURES) #if defined(MBEDTLS_VERSION_FEATURES)
#if defined(MBEDTLS_HAVE_ASM) #if defined(MBEDTLS_HAVE_ASM)
"MBEDTLS_HAVE_ASM", "MBEDTLS_HAVE_ASM",
#endif /* MBEDTLS_HAVE_ASM */ #endif /* MBEDTLS_HAVE_ASM */
#if defined(MBEDTLS_NO_UDBL_DIVISION) #if defined(MBEDTLS_NO_UDBL_DIVISION)
@ -850,23 +850,25 @@ static const char * const features[] = {
NULL NULL
}; };
int mbedtls_version_check_feature( const char *feature ) int mbedtls_version_check_feature(const char *feature)
{ {
const char * const *idx = features; const char * const *idx = features;
if( *idx == NULL ) if (*idx == NULL) {
return( -2 ); return -2;
}
if( feature == NULL ) if (feature == NULL) {
return( -1 ); return -1;
}
while( *idx != NULL ) while (*idx != NULL) {
{ if (!strcmp(*idx, feature)) {
if( !strcmp( *idx, feature ) ) return 0;
return( 0 ); }
idx++; idx++;
} }
return( -1 ); return -1;
} }
#endif /* MBEDTLS_VERSION_C */ #endif /* MBEDTLS_VERSION_C */

15
programs/test/query_config.c
View File

@ -110,11 +110,12 @@
*/ */
#define MACRO_EXPANSION_TO_STR(macro) MACRO_NAME_TO_STR(macro) #define MACRO_EXPANSION_TO_STR(macro) MACRO_NAME_TO_STR(macro)
#define 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 STRINGIFY(macro) #macro
#define OUTPUT_MACRO_NAME_VALUE(macro) mbedtls_printf( #macro "%s\n", \ #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) #if defined(_MSC_VER)
/* /*
@ -129,9 +130,9 @@
#pragma warning(disable:4003) #pragma warning(disable:4003)
#endif /* _MSC_VER */ #endif /* _MSC_VER */
int query_config( const char *config ) int query_config(const char *config)
{ {
#if defined(MBEDTLS_HAVE_ASM) #if defined(MBEDTLS_HAVE_ASM)
if( strcmp( "MBEDTLS_HAVE_ASM", config ) == 0 ) if( strcmp( "MBEDTLS_HAVE_ASM", config ) == 0 )
{ {
MACRO_EXPANSION_TO_STR( MBEDTLS_HAVE_ASM ); MACRO_EXPANSION_TO_STR( MBEDTLS_HAVE_ASM );
@ -2875,11 +2876,11 @@ int query_config( const char *config )
} }
#endif /* MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED */ #endif /* MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED */
/* If the symbol is not found, return an error */ /* If the symbol is not found, return an error */
return( 1 ); return 1;
} }
void list_config( void ) void list_config(void)
{ {
#if defined(MBEDTLS_HAVE_ASM) #if defined(MBEDTLS_HAVE_ASM)
OUTPUT_MACRO_NAME_VALUE(MBEDTLS_HAVE_ASM); OUTPUT_MACRO_NAME_VALUE(MBEDTLS_HAVE_ASM);