diff options
| author | Damien George <damien@micropython.org> | 2023-04-30 18:06:19 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2023-05-01 10:54:02 +1000 |
| commit | 4ff148de4582bb6ed01cb4b5189cc8ec312e09f5 (patch) | |
| tree | aab123caa79bd16ba7ecb98264102df848fc6b60 /lib/mbedtls_errors/generate_errors.diff | |
| parent | b5f4611969302aab0b75620b8ae4450c97d4f79d (diff) | |
| download | micropython-4ff148de4582bb6ed01cb4b5189cc8ec312e09f5.tar.gz micropython-4ff148de4582bb6ed01cb4b5189cc8ec312e09f5.zip | |
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>
Diffstat (limited to 'lib/mbedtls_errors/generate_errors.diff')
| -rw-r--r-- | lib/mbedtls_errors/generate_errors.diff | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/lib/mbedtls_errors/generate_errors.diff b/lib/mbedtls_errors/generate_errors.diff index ad24c372fa..bea47cd66f 100644 --- a/lib/mbedtls_errors/generate_errors.diff +++ b/lib/mbedtls_errors/generate_errors.diff @@ -1,22 +1,29 @@ ---- generate_errors_orig.pl 2020-06-20 08:40:38.819060379 -0700 -+++ generate_errors.pl 2020-06-20 08:47:26.511163591 -0700 -@@ -162,16 +162,12 @@ - - if ($error_name eq "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE") +--- generate_errors_orig.pl 2023-04-30 17:58:23.503070758 +1000 ++++ generate_errors.py 2023-04-30 17:58:20.826338349 +1000 +@@ -162,7 +162,7 @@ { -- ${$code_check} .= "${white_space}if( use_ret == -($error_name) )\n". -- "${white_space}\{\n". -- "${white_space} mbedtls_snprintf( buf, buflen, \"$module_name - $description\" );\n". -- "${white_space} return;\n". -- "${white_space}}\n" -+ # no-op, this case is hard-coded in error.fmt + $code_check = \$ll_code_check; + $old_define = \$ll_old_define; +- $white_space = ' '; ++ $white_space = ' '; } else { -- ${$code_check} .= "${white_space}if( use_ret == -($error_name) )\n". -- "${white_space} mbedtls_snprintf( buf, buflen, \"$module_name - $description\" );\n" -+ my $error_text = $error_name =~ s/^MBEDTLS_ERR_//r; -+ ${$code_check} .= "${white_space}{ -($error_name), \"$error_text\" },\n" +@@ -203,8 +203,15 @@ + ${$old_define} = $define_name; } + +- ${$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 "") |