From f1931760d891289d7f6c22b8f6a672d8f8b4a8ad Mon Sep 17 00:00:00 2001
From: Hanno Becker <hanno.becker@arm.com>
Date: Mon, 17 Dec 2018 14:20:05 +0000
Subject: [PATCH] Move test of mbedtls_camellia_free() to separate test

The acceptance of NULL should be tested regardless of the
setting of MBEDTLS_CHECK_PARAMS.
---
 tests/suites/test_suite_camellia.data     | 5 ++++-
 tests/suites/test_suite_camellia.function | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/suites/test_suite_camellia.data b/tests/suites/test_suite_camellia.data
index af4718f158..671d57002a 100644
--- a/tests/suites/test_suite_camellia.data
+++ b/tests/suites/test_suite_camellia.data
@@ -1,4 +1,7 @@
-Camellia parameter validation
+Camellia - Valid parameters
+camellia_valid_param:
+
+Camellia - Invalid parameters
 camellia_invalid_param:
 
 Camellia-128-ECB Encrypt RFC3713 #1
diff --git a/tests/suites/test_suite_camellia.function b/tests/suites/test_suite_camellia.function
index 5d70fa2c97..9408348151 100644
--- a/tests/suites/test_suite_camellia.function
+++ b/tests/suites/test_suite_camellia.function
@@ -7,6 +7,13 @@
  * END_DEPENDENCIES
  */
 
+/* BEGIN_CASE */
+void camellia_valid_param( )
+{
+    TEST_VALID_PARAM( mbedtls_camellia_free( NULL ) );
+}
+/* END_CASE */
+
 /* BEGIN_CASE depends_on:MBEDTLS_CHECK_PARAMS:!MBEDTLS_PARAM_FAILED_ALT */
 void camellia_invalid_param( )
 {
@@ -19,7 +26,6 @@ void camellia_invalid_param( )
     ((void) off);
 
     TEST_INVALID_PARAM( mbedtls_camellia_init( NULL ) );
-    TEST_VALID_PARAM( mbedtls_camellia_free( NULL ) );
 
     TEST_INVALID_PARAM_RET( MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA,
                             mbedtls_camellia_setkey_enc( NULL,