Merge pull request #21321 from mguetschow/cc310-file-macros

mguetschow · web-flow · commit 2b8b1109865d · 2025-03-27T13:56:00.000Z
pkg/driver_cryptocell_310: replace deprecated RIOT_FILE_RELATIVE
diff --git a/pkg/driver_cryptocell_310/psa_cryptocell_310/aes_common.c b/pkg/driver_cryptocell_310/psa_cryptocell_310/aes_common.c
@@ -42,7 +42,7 @@ psa_status_t cryptocell_310_common_aes_setup(SaSiAesUserContext_t *ctx,
 
     if (!cryptocell_310_data_within_ram(iv) ||
         !cryptocell_310_data_within_ram(key_buffer)) {
-        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
+        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);
         return PSA_ERROR_DATA_INVALID;
     }
 
@@ -84,7 +84,7 @@ psa_status_t cryptocell_310_common_aes_encrypt_decrypt(SaSiAesUserContext_t *ctx
     *output_length = output_size;
 
     if (!cryptocell_310_data_within_ram(input)) {
-        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
+        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);
         return PSA_ERROR_DATA_INVALID;
     }
 
diff --git a/pkg/driver_cryptocell_310/psa_cryptocell_310/cipher_chacha20.c b/pkg/driver_cryptocell_310/psa_cryptocell_310/cipher_chacha20.c
@@ -43,7 +43,7 @@ psa_status_t psa_cipher_chacha20_encrypt(uint8_t *key_buffer,
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 
     if (!cryptocell_310_data_within_ram(input)) {
-        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
+        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);
         return PSA_ERROR_DATA_INVALID;
     }
 
@@ -91,7 +91,7 @@ psa_status_t psa_cipher_chacha20_decrypt(uint8_t *key_buffer,
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 
     if (!cryptocell_310_data_within_ram(input)) {
-        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
+        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);
         return PSA_ERROR_DATA_INVALID;
     }
 
diff --git a/pkg/driver_cryptocell_310/psa_cryptocell_310/ecc_common.c b/pkg/driver_cryptocell_310/psa_cryptocell_310/ecc_common.c
@@ -87,7 +87,7 @@ psa_status_t cryptocell_310_common_ecc_sign(const uint8_t *priv_key,
 
     if (!cryptocell_310_data_within_ram(priv_key) ||
         !cryptocell_310_data_within_ram(input)) {
-        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
+        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);
         return PSA_ERROR_DATA_INVALID;
     }
 
@@ -131,7 +131,7 @@ psa_status_t cryptocell_310_common_ecc_verify(const uint8_t *pub_key,
     if (!cryptocell_310_data_within_ram(pub_key) ||
         !cryptocell_310_data_within_ram(input) ||
         !cryptocell_310_data_within_ram(signature)) {
-        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
+        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);
         return PSA_ERROR_DATA_INVALID;
     }
 
diff --git a/pkg/driver_cryptocell_310/psa_cryptocell_310/ecc_ed25519.c b/pkg/driver_cryptocell_310/psa_cryptocell_310/ecc_ed25519.c
@@ -68,7 +68,7 @@ psa_status_t psa_derive_ecc_ed25519_public_key( const uint8_t *priv_key_buffer,
     CRYSError_t ret;
 
     if (!cryptocell_310_data_within_ram(priv_key_buffer)) {
-        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
+        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);
         return PSA_ERROR_DATA_INVALID;
     }
 
@@ -108,7 +108,7 @@ psa_status_t psa_ecc_ed25519_sign_message(const uint8_t *priv_key_buffer,
     if (!cryptocell_310_data_within_ram(priv_key_buffer) ||
         !cryptocell_310_data_within_ram(pub_key_buffer) ||
         !cryptocell_310_data_within_ram(input)) {
-        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
+        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);
         return PSA_ERROR_DATA_INVALID;
     }
 
@@ -155,7 +155,7 @@ psa_status_t psa_ecc_ed25519_verify_message(const uint8_t *key_buffer,
     if (!cryptocell_310_data_within_ram(key_buffer) ||
         !cryptocell_310_data_within_ram(input) ||
         !cryptocell_310_data_within_ram(signature)) {
-        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
+        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);
         return PSA_ERROR_DATA_INVALID;
     }
 
diff --git a/pkg/driver_cryptocell_310/psa_cryptocell_310/hmac.c b/pkg/driver_cryptocell_310/psa_cryptocell_310/hmac.c
@@ -43,7 +43,7 @@ psa_status_t psa_mac_compute_hmac_sha256(const psa_key_attributes_t *attributes,
 
     if (!cryptocell_310_data_within_ram(key_buffer) ||
         !cryptocell_310_data_within_ram(input)) {
-        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);
+        DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);
         return PSA_ERROR_DATA_INVALID;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ psa_status_t cryptocell_310_common_aes_setup(SaSiAesUserContext_t *ctx,`
`42`	`42`
`43`	`43`	`if (!cryptocell_310_data_within_ram(iv) \|\|`
`44`	`44`	`!cryptocell_310_data_within_ram(key_buffer)) {`
`45`		`- DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);`
	`45`	`+ DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);`
`46`	`46`	`return PSA_ERROR_DATA_INVALID;`
`47`	`47`	`}`
`48`	`48`
`@@ -84,7 +84,7 @@ psa_status_t cryptocell_310_common_aes_encrypt_decrypt(SaSiAesUserContext_t *ctx`
`84`	`84`	`*output_length = output_size;`
`85`	`85`
`86`	`86`	`if (!cryptocell_310_data_within_ram(input)) {`
`87`		`- DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);`
	`87`	`+ DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);`
`88`	`88`	`return PSA_ERROR_DATA_INVALID;`
`89`	`89`	`}`
`90`	`90`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ psa_status_t psa_cipher_chacha20_encrypt(uint8_t *key_buffer,`
`43`	`43`	`psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;`
`44`	`44`
`45`	`45`	`if (!cryptocell_310_data_within_ram(input)) {`
`46`		`- DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);`
	`46`	`+ DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);`
`47`	`47`	`return PSA_ERROR_DATA_INVALID;`
`48`	`48`	`}`
`49`	`49`
`@@ -91,7 +91,7 @@ psa_status_t psa_cipher_chacha20_decrypt(uint8_t *key_buffer,`
`91`	`91`	`psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;`
`92`	`92`
`93`	`93`	`if (!cryptocell_310_data_within_ram(input)) {`
`94`		`- DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);`
	`94`	`+ DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);`
`95`	`95`	`return PSA_ERROR_DATA_INVALID;`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ psa_status_t cryptocell_310_common_ecc_sign(const uint8_t *priv_key,`
`87`	`87`
`88`	`88`	`if (!cryptocell_310_data_within_ram(priv_key) \|\|`
`89`	`89`	`!cryptocell_310_data_within_ram(input)) {`
`90`		`- DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);`
	`90`	`+ DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);`
`91`	`91`	`return PSA_ERROR_DATA_INVALID;`
`92`	`92`	`}`
`93`	`93`
`@@ -131,7 +131,7 @@ psa_status_t cryptocell_310_common_ecc_verify(const uint8_t *pub_key,`
`131`	`131`	`if (!cryptocell_310_data_within_ram(pub_key) \|\|`
`132`	`132`	`!cryptocell_310_data_within_ram(input) \|\|`
`133`	`133`	`!cryptocell_310_data_within_ram(signature)) {`
`134`		`- DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);`
	`134`	`+ DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);`
`135`	`135`	`return PSA_ERROR_DATA_INVALID;`
`136`	`136`	`}`
`137`	`137`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ psa_status_t psa_mac_compute_hmac_sha256(const psa_key_attributes_t *attributes,`
`43`	`43`
`44`	`44`	`if (!cryptocell_310_data_within_ram(key_buffer) \|\|`
`45`	`45`	`!cryptocell_310_data_within_ram(input)) {`
`46`		`- DEBUG("%s : cryptocell_310 data required to be in RAM.\n", RIOT_FILE_RELATIVE);`
	`46`	`+ DEBUG("%s : cryptocell_310 data required to be in RAM.\n", __FILE__);`
`47`	`47`	`return PSA_ERROR_DATA_INVALID;`
`48`	`48`	`}`
`49`	`49`