Fix arity of the PARAM_FAILED() macro and function
It was inconsistent between files: sometimes 3 arguments, sometimes one.
Align to 1 argument for the macro and 3 for the function, because:
- we don't need 3 arguments for the macro, it can add __FILE__ and __LINE__
in its expansion, while the function needs them as parameters to be correct;
- people who re-defined the macro should have flexibility, and 3 arguments
can give the impression they they don't have as much as they actually do;
- the design document has the macro with 1 argument, so let's stick to that.
diff --git a/include/mbedtls/aes.h b/include/mbedtls/aes.h
index 35c2229..62c1f92 100644
--- a/include/mbedtls/aes.h
+++ b/include/mbedtls/aes.h
@@ -69,16 +69,12 @@
#if defined( MBEDTLS_CHECK_PARAMS )
#define MBEDTLS_AES_VALIDATE_RET( cond ) do{ if( !(cond) ) { \
- MBEDTLS_PARAM_FAILED( #cond, \
- __FILE__, \
- __LINE__ ); \
+ MBEDTLS_PARAM_FAILED( #cond ); \
return MBEDTLS_ERR_AES_BAD_INPUT_DATA;} \
} while(0);
#define MBEDTLS_AES_VALIDATE( cond ) do{ if( !(cond) ) { \
- MBEDTLS_PARAM_FAILED( #cond, \
- __FILE__, \
- __LINE__ ); \
+ MBEDTLS_PARAM_FAILED( #cond ); \
return; } \
} while(0);
#else
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index a8a8f75..25f6c8c 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -3015,7 +3015,7 @@
//#define MBEDTLS_PLATFORM_NV_SEED_READ_MACRO mbedtls_platform_std_nv_seed_read /**< Default nv_seed_read function to use, can be undefined */
//#define MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO mbedtls_platform_std_nv_seed_write /**< Default nv_seed_write function to use, can be undefined */
-//#define MBEDTLS_PARAM_FAILED(x) mbedtls_param_failed( #x ) /**< Default parameter validation callback to use. Can be undefined */
+//#define MBEDTLS_PARAM_FAILED(x) mbedtls_param_failed( #x, __FILE__, __LINE__ ) /**< Default parameter validation callback to use. Can be undefined */
/* SSL Cache options */
diff --git a/include/mbedtls/platform_util.h b/include/mbedtls/platform_util.h
index d099571..6aada21 100644
--- a/include/mbedtls/platform_util.h
+++ b/include/mbedtls/platform_util.h
@@ -42,8 +42,8 @@
#endif
#if defined( MBEDTLS_CHECK_PARAMS ) && !defined(MBEDTLS_PARAM_FAILED)
-#define MBEDTLS_PARAM_FAILED( cond, file, line ) \
- mbedtls_param_failed( cond, file, line )
+#define MBEDTLS_PARAM_FAILED( cond ) \
+ mbedtls_param_failed( cond, __FILE__, __LINE__ )
/**
* \brief User supplied callback function for parameter validation failure.
@@ -65,7 +65,6 @@
* execution in the application code.
*/
void mbedtls_param_failed( char* failure_condition, char* file, int line );
-
#endif /* MBEDTLS_CHECK_PARAMS && !MBEDTLS_PARAM_FAILED */
/**