From c44f67b5811ca1360aba75da797d9a996155d6e3 Mon Sep 17 00:00:00 2001 From: Harry Ramsey Date: Wed, 16 Oct 2024 21:46:44 +0100 Subject: [PATCH] Fix error.c generation issue with headers This commit fixes include issues with error.c. Since error_common.h now defines error codes, this is a mandatory include. The macro MBEDTLS_ERROR_C guards functions for strerror which is now found in error.h. Signed-off-by: Harry Ramsey --- scripts/generate_errors.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/generate_errors.pl b/scripts/generate_errors.pl index 147ecdca76..c05184227c 100755 --- a/scripts/generate_errors.pl +++ b/scripts/generate_errors.pl @@ -37,7 +37,7 @@ my $error_format_file = $data_dir.'/error.fmt'; my @low_level_modules = qw( AES ARIA ASN1 BASE64 BIGNUM CAMELLIA CCM CHACHA20 CHACHAPOLY CMAC CTR_DRBG DES - ENTROPY ERROR_COMMON GCM HKDF HMAC_DRBG LMS MD5 + ENTROPY ERROR GCM HKDF HMAC_DRBG LMS MD5 NET OID PBKDF2 PLATFORM POLY1305 RIPEMD160 SHA1 SHA256 SHA512 SHA3 THREADING ); my @high_level_modules = qw( CIPHER DHM ECP MD @@ -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; } } @@ -121,7 +122,6 @@ foreach my $match (@matches) $module_name = "BIGNUM" if ($module_name eq "MPI"); $module_name = "CTR_DRBG" if ($module_name eq "CTR"); $module_name = "HMAC_DRBG" if ($module_name eq "HMAC"); - $module_name = "ERROR_COMMON" if ($module_name eq "ERROR"); my $define_name = $module_name; $define_name = "X509_USE,X509_CREATE" if ($define_name eq "X509");