Add some name changes in to allow merge
Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
diff --git a/programs/fuzz/CMakeLists.txt b/programs/fuzz/CMakeLists.txt
index 53d771c..54b07b4 100644
--- a/programs/fuzz/CMakeLists.txt
+++ b/programs/fuzz/CMakeLists.txt
@@ -37,7 +37,7 @@
# This emulates "if ( ... IN_LIST ... )" which becomes available in CMake 3.3
list(FIND executables_with_common_c ${exe} exe_index)
if(${exe_index} GREATER -1)
- list(APPEND exe_sources fuzz_common.c)
+ list(APPEND exe_sources common.c)
endif()
add_executable(${exe} ${exe_sources})
diff --git a/programs/fuzz/fuzz_common.c b/programs/fuzz/common.c
similarity index 98%
rename from programs/fuzz/fuzz_common.c
rename to programs/fuzz/common.c
index de16913..41fa858 100644
--- a/programs/fuzz/fuzz_common.c
+++ b/programs/fuzz/common.c
@@ -1,6 +1,6 @@
#define MBEDTLS_DECLARE_PRIVATE_IDENTIFIERS
-#include "fuzz_common.h"
+#include "common.h"
#include <limits.h>
#include <stdio.h>
#include <string.h>
diff --git a/programs/fuzz/fuzz_common.h b/programs/fuzz/common.h
similarity index 100%
rename from programs/fuzz/fuzz_common.h
rename to programs/fuzz/common.h
diff --git a/programs/fuzz/fuzz_client.c b/programs/fuzz/fuzz_client.c
index 440c024..6d3b73f 100644
--- a/programs/fuzz/fuzz_client.c
+++ b/programs/fuzz/fuzz_client.c
@@ -4,7 +4,7 @@
#include "mbedtls/entropy.h"
#include "mbedtls/ctr_drbg.h"
#include "test/certs.h"
-#include "fuzz_common.h"
+#include "common.h"
#include <string.h>
#include <stdlib.h>
#include <stdint.h>
diff --git a/programs/fuzz/fuzz_dtlsclient.c b/programs/fuzz/fuzz_dtlsclient.c
index 7a1da13..efe1362 100644
--- a/programs/fuzz/fuzz_dtlsclient.c
+++ b/programs/fuzz/fuzz_dtlsclient.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdint.h>
-#include "fuzz_common.h"
+#include "common.h"
#include "mbedtls/ssl.h"
#if defined(MBEDTLS_SSL_PROTO_DTLS)
#include "mbedtls/entropy.h"
diff --git a/programs/fuzz/fuzz_dtlsserver.c b/programs/fuzz/fuzz_dtlsserver.c
index 98a7021..31eb514 100644
--- a/programs/fuzz/fuzz_dtlsserver.c
+++ b/programs/fuzz/fuzz_dtlsserver.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdint.h>
-#include "fuzz_common.h"
+#include "common.h"
#include "mbedtls/ssl.h"
#include "test/certs.h"
#if defined(MBEDTLS_SSL_PROTO_DTLS)
diff --git a/programs/fuzz/fuzz_pkcs7.c b/programs/fuzz/fuzz_pkcs7.c
index f236190..9ec9351 100644
--- a/programs/fuzz/fuzz_pkcs7.c
+++ b/programs/fuzz/fuzz_pkcs7.c
@@ -2,7 +2,7 @@
#include <stdint.h>
#include "mbedtls/pkcs7.h"
-#include "fuzz_common.h"
+#include "common.h"
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
{
diff --git a/programs/fuzz/fuzz_server.c b/programs/fuzz/fuzz_server.c
index 05b7480..bb9dd0a 100644
--- a/programs/fuzz/fuzz_server.c
+++ b/programs/fuzz/fuzz_server.c
@@ -5,7 +5,7 @@
#include "mbedtls/ctr_drbg.h"
#include "mbedtls/ssl_ticket.h"
#include "test/certs.h"
-#include "fuzz_common.h"
+#include "common.h"
#include <string.h>
#include <stdlib.h>
#include <stdint.h>
diff --git a/programs/fuzz/fuzz_x509crl.c b/programs/fuzz/fuzz_x509crl.c
index 92e0f5d..2840fbb 100644
--- a/programs/fuzz/fuzz_x509crl.c
+++ b/programs/fuzz/fuzz_x509crl.c
@@ -2,7 +2,7 @@
#include <stdint.h>
#include "mbedtls/x509_crl.h"
-#include "fuzz_common.h"
+#include "common.h"
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
{
diff --git a/programs/fuzz/fuzz_x509crt.c b/programs/fuzz/fuzz_x509crt.c
index c99ae2e..29331b9 100644
--- a/programs/fuzz/fuzz_x509crt.c
+++ b/programs/fuzz/fuzz_x509crt.c
@@ -2,7 +2,7 @@
#include <stdint.h>
#include "mbedtls/x509_crt.h"
-#include "fuzz_common.h"
+#include "common.h"
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
{
diff --git a/programs/fuzz/fuzz_x509csr.c b/programs/fuzz/fuzz_x509csr.c
index 4ab071f..e0aaabc 100644
--- a/programs/fuzz/fuzz_x509csr.c
+++ b/programs/fuzz/fuzz_x509csr.c
@@ -2,7 +2,7 @@
#include <stdint.h>
#include "mbedtls/x509_csr.h"
-#include "fuzz_common.h"
+#include "common.h"
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
{
diff --git a/programs/fuzz/onefile.c b/programs/fuzz/onefile.c
index 4835128..6c02a64 100644
--- a/programs/fuzz/onefile.c
+++ b/programs/fuzz/onefile.c
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
-#include "fuzz_common.h"
+#include "common.h"
/* This file doesn't use any Mbed TLS function, but grab mbedtls_config.h anyway
* in case it contains platform-specific #defines related to malloc or