From 43c8f8cf79b97d555d76af9c9240e9f948b95ec9 Mon Sep 17 00:00:00 2001
From: Hanno Becker <hanno.becker@arm.com>
Date: Fri, 5 Mar 2021 05:16:45 +0000
Subject: [PATCH] Put MPS under the umbrella of the TLS 1.3 experimental
 configuration

Signed-off-by: Hanno Becker <hanno.becker@arm.com>
---
 library/mps_reader.c                 | 6 ++++++
 library/mps_trace.c                  | 5 +++++
 tests/suites/test_suite_mps.function | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/library/mps_reader.c b/library/mps_reader.c
index ac2955fec..c23446cff 100644
--- a/library/mps_reader.c
+++ b/library/mps_reader.c
@@ -19,6 +19,10 @@
  *  This file is part of Mbed TLS (https://tls.mbed.org)
  */
 
+#include "common.h"
+
+#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
+
 #include "mps_reader.h"
 #include "mps_common.h"
 #include "mps_trace.h"
@@ -557,3 +561,5 @@ int mbedtls_mps_reader_reclaim( mbedtls_mps_reader *rd,
                        (unsigned) rd->acc_share.acc_remaining );
     MBEDTLS_MPS_TRACE_RETURN( 0 );
 }
+
+#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */
diff --git a/library/mps_trace.c b/library/mps_trace.c
index 28b05bb79..dc0577daa 100644
--- a/library/mps_trace.c
+++ b/library/mps_trace.c
@@ -19,6 +19,10 @@
  *  This file is part of Mbed TLS (https://tls.mbed.org)
  */
 
+#include "common.h"
+
+#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
+
 #include "mps_common.h"
 
 #if defined(MBEDTLS_MPS_ENABLE_TRACE)
@@ -120,3 +124,4 @@ void mbedtls_mps_trace_indent( int level, mbedtls_mps_trace_type ty )
 }
 
 #endif /* MBEDTLS_MPS_ENABLE_TRACE */
+#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */
diff --git a/tests/suites/test_suite_mps.function b/tests/suites/test_suite_mps.function
index d67e7d227..57a84cb12 100644
--- a/tests/suites/test_suite_mps.function
+++ b/tests/suites/test_suite_mps.function
@@ -19,6 +19,11 @@
 
 /* END_HEADER */
 
+/* BEGIN_DEPENDENCIES
+ * depends_on:MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL
+ * END_DEPENDENCIES
+ */
+
 /* BEGIN_CASE depends_on:TEST_SUITE_MPS_READER */
 void mbedtls_mps_reader_no_pausing_single_step_single_round( int with_acc )
 {