Rename MPS files library/mps/xxx.[ch] to library/mps_xxx.[ch]

Signed-off-by: Hanno Becker <hanno.becker@arm.com>

library/CMakeLists.txt

@@ -47,8 +47,8 @@ set(src_crypto
     md4.c
     md5.c
     memory_buffer_alloc.c
-    mps/reader.c
+    mps_reader.c
-    mps/trace.o
+    mps_trace.c
     nist_kw.c
     oid.c
     padlock.c

library/Makefile

@@ -104,8 +104,8 @@ OBJS_CRYPTO= \
 	     md4.o \
 	     md5.o \
 	     memory_buffer_alloc.o \
-             mps/reader.o \
+             mps_reader.o \
-             mps/trace.o \
+             mps_trace.o \
 	     nist_kw.o \
 	     oid.o \
 	     padlock.o \

library/mps_reader.c

@@ -19,9 +19,9 @@
  *  This file is part of Mbed TLS (https://tls.mbed.org)
  */
 
-#include "reader.h"
+#include "mps_reader.h"
-#include "common.h"
+#include "mps_common.h"
-#include "trace.h"
+#include "mps_trace.h"
 
 #include <string.h>
 

library/mps_reader.h

@@ -116,8 +116,8 @@
 
 #include <stdio.h>
 
-#include "common.h"
+#include "mps_common.h"
-#include "error.h"
+#include "mps_error.h"
 
 struct mbedtls_reader;
 typedef struct mbedtls_reader mbedtls_reader;

library/mps_trace.c

@@ -19,11 +19,11 @@
  *  This file is part of Mbed TLS (https://tls.mbed.org)
  */
 
-#include "common.h"
+#include "mps_common.h"
 
 #if defined(MBEDTLS_MPS_TRACE)
 
-#include "trace.h"
+#include "mps_trace.h"
 #include <stdarg.h>
 
 static int trace_depth_ = 0;

library/mps_trace.h

@@ -27,10 +27,9 @@
 #define MBEDTLS_MPS_TRACE_H
 
 #include "common.h"
+#include "mps_common.h"
+#include "mps_trace.h"
 
-#include "../common.h"
-
-#include "trace.h"
 #if defined(MBEDTLS_PLATFORM_C)
 #include "mbedtls/platform.h"
 #else

tests/suites/test_suite_mps.function

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 
 /* TODO: How are test suites supposed to include internal headers? */
-#include "../library/mps/reader.h"
+#include "../library/mps_reader.h"
 
 /*
  * Compile-time configuration for test suite.