Merge pull request #6394 from mprse/enc_types_2_28_backport
Backport 2.28: Test TLS 1.2 builds with each encryption type
diff --git a/scripts/config.py b/scripts/config.py
index 91e37ad..c106a97 100755
--- a/scripts/config.py
+++ b/scripts/config.py
@@ -7,6 +7,9 @@
if 'MBEDTLS_RSA_C' in config: print('RSA is enabled')
"""
+# Note that the version of this script in the mbedtls-2.28 branch must remain
+# compatible with Python 3.4.
+
## Copyright The Mbed TLS Contributors
## SPDX-License-Identifier: Apache-2.0
##
diff --git a/scripts/mbedtls_dev/test_case.py b/scripts/mbedtls_dev/test_case.py
index 6a46e42..d0afa59 100644
--- a/scripts/mbedtls_dev/test_case.py
+++ b/scripts/mbedtls_dev/test_case.py
@@ -92,9 +92,11 @@
"""
if caller is None:
caller = os.path.basename(sys.argv[0])
- with open(filename, 'w') as out:
+ tempfile = filename + '.new'
+ with open(tempfile, 'w') as out:
out.write('# Automatically generated by {}. Do not edit!\n'
.format(caller))
for tc in test_cases:
tc.write(out)
out.write('\n# End of automatically generated file.\n')
+ os.replace(tempfile, filename)
diff --git a/tests/include/test/helpers.h b/tests/include/test/helpers.h
index 0d97e80..757a43b 100644
--- a/tests/include/test/helpers.h
+++ b/tests/include/test/helpers.h
@@ -58,6 +58,13 @@
#include "mbedtls/bignum.h"
#endif
+/** The type of test case arguments that contain binary data. */
+typedef struct data_tag
+{
+ uint8_t * x;
+ uint32_t len;
+} data_t;
+
typedef enum
{
MBEDTLS_TEST_RESULT_SUCCESS = 0,
@@ -379,7 +386,6 @@
*
* \return \c 0 on success, an \c MBEDTLS_ERR_MPI_xxx error code otherwise.
*/
-/* Since the library has exactly the desired behavior, this is trivial. */
int mbedtls_test_read_mpi( mbedtls_mpi *X, const char *s );
#endif /* MBEDTLS_BIGNUM_C */
diff --git a/tests/src/helpers.c b/tests/src/helpers.c
index c310d48..bfd2189 100644
--- a/tests/src/helpers.c
+++ b/tests/src/helpers.c
@@ -15,6 +15,7 @@
* limitations under the License.
*/
+#include <test/constant_flow.h>
#include <test/helpers.h>
#include <test/macros.h>
#include <string.h>
@@ -120,8 +121,12 @@
int mbedtls_test_equal( const char *test, int line_no, const char* filename,
unsigned long long value1, unsigned long long value2 )
{
+ TEST_CF_PUBLIC( &value1, sizeof( value1 ) );
+ TEST_CF_PUBLIC( &value2, sizeof( value2 ) );
+
if( value1 == value2 )
return( 1 );
+
if( mbedtls_test_info.result == MBEDTLS_TEST_RESULT_FAILED )
{
/* We've already recorded the test as having failed. Don't
@@ -143,8 +148,12 @@
int mbedtls_test_le_u( const char *test, int line_no, const char* filename,
unsigned long long value1, unsigned long long value2 )
{
+ TEST_CF_PUBLIC( &value1, sizeof( value1 ) );
+ TEST_CF_PUBLIC( &value2, sizeof( value2 ) );
+
if( value1 <= value2 )
return( 1 );
+
if( mbedtls_test_info.result == MBEDTLS_TEST_RESULT_FAILED )
{
/* We've already recorded the test as having failed. Don't
@@ -166,8 +175,12 @@
int mbedtls_test_le_s( const char *test, int line_no, const char* filename,
long long value1, long long value2 )
{
+ TEST_CF_PUBLIC( &value1, sizeof( value1 ) );
+ TEST_CF_PUBLIC( &value2, sizeof( value2 ) );
+
if( value1 <= value2 )
return( 1 );
+
if( mbedtls_test_info.result == MBEDTLS_TEST_RESULT_FAILED )
{
/* We've already recorded the test as having failed. Don't
diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function
index 91ad925..a7531e7 100644
--- a/tests/suites/helpers.function
+++ b/tests/suites/helpers.function
@@ -51,13 +51,6 @@
#include <strings.h>
#endif
-/* Type for Hex parameters */
-typedef struct data_tag
-{
- uint8_t * x;
- uint32_t len;
-} data_t;
-
/*----------------------------------------------------------------------------*/
/* Status and error constants */