mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-08-07 06:42:56 +03:00
Merge pull request #9693 from Harry-Ramsey/split-revert-error-development
Split error.h and move back error.c to mbedtls
This commit is contained in:
@@ -220,6 +220,8 @@ def include_in_crypto(name):
|
||||
'MBEDTLS_DEBUG_C', # part of libmbedtls
|
||||
'MBEDTLS_NET_C', # part of libmbedtls
|
||||
'MBEDTLS_PKCS7_C', # part of libmbedx509
|
||||
'MBEDTLS_ERROR_C', # part of libmbedx509
|
||||
'MBEDTLS_ERROR_STRERROR_DUMMY', # part of libmbedx509
|
||||
]:
|
||||
return False
|
||||
if name in EXCLUDE_FROM_CRYPTO:
|
||||
|
@@ -152,8 +152,4 @@ void mbedtls_strerror(int ret, char *buf, size_t buflen)
|
||||
|
||||
#endif /* MBEDTLS_ERROR_C */
|
||||
|
||||
#if defined(MBEDTLS_TEST_HOOKS)
|
||||
void (*mbedtls_test_hook_error_add)(int, int, const char *, int);
|
||||
#endif
|
||||
|
||||
#endif /* MBEDTLS_ERROR_C || MBEDTLS_ERROR_STRERROR_DUMMY */
|
||||
|
@@ -24,7 +24,7 @@ if( @ARGV ) {
|
||||
$crypto_include_dir = 'tf-psa-crypto/drivers/builtin/include/mbedtls';
|
||||
$tls_include_dir = 'include/mbedtls';
|
||||
$data_dir = 'scripts/data_files';
|
||||
$error_file = 'tf-psa-crypto/drivers/builtin/src/error.c';
|
||||
$error_file = 'library/error.c';
|
||||
|
||||
unless( -d $crypto_include_dir && -d $tls_include_dir && -d $data_dir ) {
|
||||
chdir '..' or die;
|
||||
@@ -91,6 +91,7 @@ foreach my $file (@files) {
|
||||
if ($found) {
|
||||
my $include_name = $file;
|
||||
$include_name =~ s!.*/!!;
|
||||
$include_name = "error.h" if ($include_name eq "error_common.h");
|
||||
push @necessary_include_files, $include_name;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user