kopia lustrzana https://github.com/micropython/micropython
lib/mbedtls_errors: Update patch and error list for new mbedtls.
Running `./do-mp.sh` now generates this mp_mbedtls_errors.c with mbedTLS v2.28.1. Signed-off-by: Damien George <damien@micropython.org>pull/11361/head
rodzic
b5f4611969
commit
4ff148de45
|
@ -110,7 +110,7 @@ void mbedtls_strerror(int ret, char *buf, size_t buflen) {
|
||||||
if (got_hl) {
|
if (got_hl) {
|
||||||
use_ret = ret & 0xFF80;
|
use_ret = ret & 0xFF80;
|
||||||
|
|
||||||
// special case
|
// special case, don't try to translate low level code
|
||||||
#if defined(MBEDTLS_SSL_TLS_C)
|
#if defined(MBEDTLS_SSL_TLS_C)
|
||||||
if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
|
if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
|
||||||
strncpy(buf, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE", buflen);
|
strncpy(buf, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE", buflen);
|
||||||
|
|
|
@ -1,22 +1,29 @@
|
||||||
--- generate_errors_orig.pl 2020-06-20 08:40:38.819060379 -0700
|
--- generate_errors_orig.pl 2023-04-30 17:58:23.503070758 +1000
|
||||||
+++ generate_errors.pl 2020-06-20 08:47:26.511163591 -0700
|
+++ generate_errors.py 2023-04-30 17:58:20.826338349 +1000
|
||||||
@@ -162,16 +162,12 @@
|
@@ -162,7 +162,7 @@
|
||||||
|
|
||||||
if ($error_name eq "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE")
|
|
||||||
{
|
{
|
||||||
- ${$code_check} .= "${white_space}if( use_ret == -($error_name) )\n".
|
$code_check = \$ll_code_check;
|
||||||
- "${white_space}\{\n".
|
$old_define = \$ll_old_define;
|
||||||
- "${white_space} mbedtls_snprintf( buf, buflen, \"$module_name - $description\" );\n".
|
- $white_space = ' ';
|
||||||
- "${white_space} return;\n".
|
+ $white_space = ' ';
|
||||||
- "${white_space}}\n"
|
|
||||||
+ # no-op, this case is hard-coded in error.fmt
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
- ${$code_check} .= "${white_space}if( use_ret == -($error_name) )\n".
|
@@ -203,8 +203,15 @@
|
||||||
- "${white_space} mbedtls_snprintf( buf, buflen, \"$module_name - $description\" );\n"
|
${$old_define} = $define_name;
|
||||||
+ my $error_text = $error_name =~ s/^MBEDTLS_ERR_//r;
|
|
||||||
+ ${$code_check} .= "${white_space}{ -($error_name), \"$error_text\" },\n"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- ${$code_check} .= "${white_space}case -($error_name):\n".
|
||||||
|
- "${white_space} return( \"$module_name - $description\" );\n"
|
||||||
|
+ if ($error_name eq "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE")
|
||||||
|
+ {
|
||||||
|
+ # no-op, this case is hard-coded in error.fmt
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ my $error_text = $error_name =~ s/^MBEDTLS_ERR_//r;
|
||||||
|
+ ${$code_check} .= "${white_space}{ -($error_name), \"$error_text\" },\n"
|
||||||
|
+ }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if ($ll_old_define ne "")
|
||||||
|
|
|
@ -113,6 +113,10 @@
|
||||||
#include "mbedtls/entropy.h"
|
#include "mbedtls/entropy.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ERROR_C)
|
||||||
|
#include "mbedtls/error.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(MBEDTLS_GCM_C)
|
#if defined(MBEDTLS_GCM_C)
|
||||||
#include "mbedtls/gcm.h"
|
#include "mbedtls/gcm.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -381,6 +385,8 @@ static const struct ssl_errs mbedtls_high_level_error_tab[] = {
|
||||||
{ -(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING), "SSL_CONTINUE_PROCESSING" },
|
{ -(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING), "SSL_CONTINUE_PROCESSING" },
|
||||||
{ -(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS), "SSL_ASYNC_IN_PROGRESS" },
|
{ -(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS), "SSL_ASYNC_IN_PROGRESS" },
|
||||||
{ -(MBEDTLS_ERR_SSL_EARLY_MESSAGE), "SSL_EARLY_MESSAGE" },
|
{ -(MBEDTLS_ERR_SSL_EARLY_MESSAGE), "SSL_EARLY_MESSAGE" },
|
||||||
|
{ -(MBEDTLS_ERR_SSL_UNEXPECTED_CID), "SSL_UNEXPECTED_CID" },
|
||||||
|
{ -(MBEDTLS_ERR_SSL_VERSION_MISMATCH), "SSL_VERSION_MISMATCH" },
|
||||||
{ -(MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS), "SSL_CRYPTO_IN_PROGRESS" },
|
{ -(MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS), "SSL_CRYPTO_IN_PROGRESS" },
|
||||||
{ -(MBEDTLS_ERR_SSL_BAD_CONFIG), "SSL_BAD_CONFIG" },
|
{ -(MBEDTLS_ERR_SSL_BAD_CONFIG), "SSL_BAD_CONFIG" },
|
||||||
#endif /* MBEDTLS_SSL_TLS_C */
|
#endif /* MBEDTLS_SSL_TLS_C */
|
||||||
|
@ -512,6 +518,11 @@ static const struct ssl_errs mbedtls_low_level_error_tab[] = {
|
||||||
{ -(MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR), "ENTROPY_FILE_IO_ERROR" },
|
{ -(MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR), "ENTROPY_FILE_IO_ERROR" },
|
||||||
#endif /* MBEDTLS_ENTROPY_C */
|
#endif /* MBEDTLS_ENTROPY_C */
|
||||||
|
|
||||||
|
#if defined(MBEDTLS_ERROR_C)
|
||||||
|
{ -(MBEDTLS_ERR_ERROR_GENERIC_ERROR), "ERROR_GENERIC_ERROR" },
|
||||||
|
{ -(MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED), "ERROR_CORRUPTION_DETECTED" },
|
||||||
|
#endif /* MBEDTLS_ERROR_C */
|
||||||
|
|
||||||
#if defined(MBEDTLS_GCM_C)
|
#if defined(MBEDTLS_GCM_C)
|
||||||
{ -(MBEDTLS_ERR_GCM_AUTH_FAILED), "GCM_AUTH_FAILED" },
|
{ -(MBEDTLS_ERR_GCM_AUTH_FAILED), "GCM_AUTH_FAILED" },
|
||||||
{ -(MBEDTLS_ERR_GCM_HW_ACCEL_FAILED), "GCM_HW_ACCEL_FAILED" },
|
{ -(MBEDTLS_ERR_GCM_HW_ACCEL_FAILED), "GCM_HW_ACCEL_FAILED" },
|
||||||
|
@ -655,7 +666,7 @@ void mbedtls_strerror(int ret, char *buf, size_t buflen) {
|
||||||
if (got_hl) {
|
if (got_hl) {
|
||||||
use_ret = ret & 0xFF80;
|
use_ret = ret & 0xFF80;
|
||||||
|
|
||||||
// special case
|
// special case, don't try to translate low level code
|
||||||
#if defined(MBEDTLS_SSL_TLS_C)
|
#if defined(MBEDTLS_SSL_TLS_C)
|
||||||
if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
|
if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
|
||||||
strncpy(buf, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE", buflen);
|
strncpy(buf, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE", buflen);
|
||||||
|
|
Ładowanie…
Reference in New Issue