From 71eea1649a3d45842993c0f0f11294b0e9b00c48 Mon Sep 17 00:00:00 2001 From: Ake Hedman Date: Mon, 13 May 2024 16:19:26 +0200 Subject: [PATCH] Fixed vscp_aes references --- src/common/vscp-aes.c | 4 ++-- src/vscp/common/multicastsrv.cpp | 2 +- src/vscp/common/udpsrv.cpp | 2 +- src/vscp/common/userlist.cpp | 2 +- src/vscp/common/vscp-client-ws1.cpp | 2 +- src/vscp/common/vscp-client-ws2.cpp | 2 +- src/vscp/vscp-mkpasswd/CMakeLists.txt | 4 ++-- src/vscp/vscp-mkpasswd/vscp-mkpasswd.cpp | 2 +- src/vscp/vscpcmd/Makefile.in | 6 +++--- src/vscp/vscpcmd/vscpcmd.vcxproj | 4 ++-- src/vscp/vscphubd/Makefile.in | 6 +++--- src/vscp/vscphubd/controlobject.cpp | 2 +- src/vscp/vscphubd/websocketsrv.cpp | 2 +- tests/clientlist/CMakeLists.txt | 4 ++-- tests/helperlib/CMakeLists.txt | 4 ++-- tests/helperlib/Makefile.in | 8 ++++---- tests/helperlib/Makefile.old | 4 ++-- tests/mdfparser/CMakeLists.txt | 4 ++-- tests/register/CMakeLists.txt | 4 ++-- tests/userlist/CMakeLists.txt | 4 ++-- tests/vscp-client-canal/CMakeLists.txt | 4 ++-- tests/vscp-client-mqtt/CMakeLists.txt | 4 ++-- tests/vscp-client-tcp/CMakeLists.txt | 4 ++-- tests/vscp-client-ws1/CMakeLists.txt | 4 ++-- tests/vscp-client-ws1/test-vscp-client-ws1.cpp | 2 +- tests/vscp-client-ws2/CMakeLists.txt | 4 ++-- tests/vscp-client-ws2/save_test-vscp-client-ws2.cpp | 2 +- tests/vscp-client-ws2/test-vscp-client-ws2.cpp | 2 +- tests/vscp-client/CMakeLists.txt | 4 ++-- tests/vscphelper/CMakeLists.txt | 4 ++-- tests/vscpremotetcpip/alltest/CMakeLists.txt | 4 ++-- tests/vscpremotetcpip/longtest/CMakeLists.txt | 4 ++-- 32 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/common/vscp-aes.c b/src/common/vscp-aes.c index 5d6686699..37f427df4 100644 --- a/src/common/vscp-aes.c +++ b/src/common/vscp-aes.c @@ -29,8 +29,8 @@ NOTE: String length must be evenly divisible by 16byte (str_len % 16 == 0) */ -#ifndef ___VSCP_AES_H -#define ___VSCP_AES_H +#ifndef ___vscp-aes_H +#define ___vscp-aes_H /*****************************************************************************/ diff --git a/src/vscp/common/multicastsrv.cpp b/src/vscp/common/multicastsrv.cpp index c9be7b017..f977b7f97 100644 --- a/src/vscp/common/multicastsrv.cpp +++ b/src/vscp/common/multicastsrv.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include diff --git a/src/vscp/common/udpsrv.cpp b/src/vscp/common/udpsrv.cpp index d2155e4cc..eb948118c 100644 --- a/src/vscp/common/udpsrv.cpp +++ b/src/vscp/common/udpsrv.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/vscp/common/userlist.cpp b/src/vscp/common/userlist.cpp index b9ce5c15b..946657f3f 100644 --- a/src/vscp/common/userlist.cpp +++ b/src/vscp/common/userlist.cpp @@ -48,7 +48,7 @@ #include "userlist.h" #include -#include +#include #include #include // Needs C++11 -std=c++11 diff --git a/src/vscp/common/vscp-client-ws1.cpp b/src/vscp/common/vscp-client-ws1.cpp index 0b96b650e..61e5e3208 100644 --- a/src/vscp/common/vscp-client-ws1.cpp +++ b/src/vscp/common/vscp-client-ws1.cpp @@ -35,7 +35,7 @@ #ifndef WIN32 #include #endif -#include +#include #include // #include "civetweb.h" diff --git a/src/vscp/common/vscp-client-ws2.cpp b/src/vscp/common/vscp-client-ws2.cpp index 1129735f6..a3e80dd17 100644 --- a/src/vscp/common/vscp-client-ws2.cpp +++ b/src/vscp/common/vscp-client-ws2.cpp @@ -35,7 +35,7 @@ #ifndef WIN32 #include #endif -#include +#include #include // #include "civetweb.h" diff --git a/src/vscp/vscp-mkpasswd/CMakeLists.txt b/src/vscp/vscp-mkpasswd/CMakeLists.txt index 407f4b3d0..0288e1394 100644 --- a/src/vscp/vscp-mkpasswd/CMakeLists.txt +++ b/src/vscp/vscp-mkpasswd/CMakeLists.txt @@ -52,8 +52,8 @@ add_executable(vscp-mkpasswd ${PROJECT_SOURCE_DIR}/../../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../../third_party/fastpbkdf2/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../../third_party/fastpbkdf2/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../../third_party/nlohmann/include/nlohmann/json.hpp diff --git a/src/vscp/vscp-mkpasswd/vscp-mkpasswd.cpp b/src/vscp/vscp-mkpasswd/vscp-mkpasswd.cpp index 54b7caf86..a6f1286c2 100644 --- a/src/vscp/vscp-mkpasswd/vscp-mkpasswd.cpp +++ b/src/vscp/vscp-mkpasswd/vscp-mkpasswd.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include "vscp-mkpasswd.h" diff --git a/src/vscp/vscpcmd/Makefile.in b/src/vscp/vscpcmd/Makefile.in index a60be99c4..84e37c847 100644 --- a/src/vscp/vscpcmd/Makefile.in +++ b/src/vscp/vscpcmd/Makefile.in @@ -78,7 +78,7 @@ VSCPCMD_OBJECTS = vscpcmd.o \ crc8.o \ guid.o \ sockettcp.o \ - vscp_aes.o \ + vscp-aes.o \ vscpmd5.o \ fastpbkdf2.o \ vscpbase64.o @@ -108,8 +108,8 @@ guid.o: ../common/guid.cpp ../common/guid.h sockettcp.o: ../../common/sockettcp.c ../../common/sockettcp.h $(CC) $(CFLAGS) -c ../../common/sockettcp.c -o $@ -vscp_aes.o: ../../common/vscp_aes.c ../../common/vscp_aes.h - $(CC) $(CFLAGS) -c ../../common/vscp_aes.c -o $@ +vscp-aes.o: ../../common/vscp-aes.c ../../common/vscp-aes.h + $(CC) $(CFLAGS) -c ../../common/vscp-aes.c -o $@ crc.o: ../../common/crc.c ../../common/crc.h $(CC) $(CFLAGS) -c ../../common/crc.c -o $@ diff --git a/src/vscp/vscpcmd/vscpcmd.vcxproj b/src/vscp/vscpcmd/vscpcmd.vcxproj index 2bb301728..9b89c07ed 100644 --- a/src/vscp/vscpcmd/vscpcmd.vcxproj +++ b/src/vscp/vscpcmd/vscpcmd.vcxproj @@ -439,7 +439,7 @@ - + @@ -450,7 +450,7 @@ - + diff --git a/src/vscp/vscphubd/Makefile.in b/src/vscp/vscphubd/Makefile.in index 0682e4619..12ecd05a3 100644 --- a/src/vscp/vscphubd/Makefile.in +++ b/src/vscp/vscphubd/Makefile.in @@ -111,7 +111,7 @@ VSCPD_OBJECTS = vscpd.o \ lua_all.o\ lua_vscp_wrkthread.o\ lua_vscp_func.o\ - vscp_aes.o \ + vscp-aes.o \ sqlite3.o \ sqlite3math.o \ fastpbkdf2.o \ @@ -186,8 +186,8 @@ vscpdatetime.o: ../../common/vscpdatetime.cpp ../../common/vscpdatetime.h dllist.o: ../../../common/dllist.c ../../../common/dllist.h $(CC) $(CFLAGS) -c ../../../common/dllist.c -o $@ -vscp_aes.o: ../../../common/vscp_aes.c ../../../common/vscp_aes.h - $(CC) $(CFLAGS) -c ../../../common/vscp_aes.c -o $@ +vscp-aes.o: ../../../common/vscp-aes.c ../../../common/vscp-aes.h + $(CC) $(CFLAGS) -c ../../../common/vscp-aes.c -o $@ crc.o: ../../../common/crc.c ../../../common/crc.h $(CC) $(CFLAGS) -c ../../../common/crc.c -o $@ diff --git a/src/vscp/vscphubd/controlobject.cpp b/src/vscp/vscphubd/controlobject.cpp index c58aef785..24ae9e9e9 100644 --- a/src/vscp/vscphubd/controlobject.cpp +++ b/src/vscp/vscphubd/controlobject.cpp @@ -75,7 +75,7 @@ #include #include -#include +#include #include #include diff --git a/src/vscp/vscphubd/websocketsrv.cpp b/src/vscp/vscphubd/websocketsrv.cpp index 134e4f107..1203e90e2 100644 --- a/src/vscp/vscphubd/websocketsrv.cpp +++ b/src/vscp/vscphubd/websocketsrv.cpp @@ -74,7 +74,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tests/clientlist/CMakeLists.txt b/tests/clientlist/CMakeLists.txt index 3d8b79799..3d39e3cf2 100644 --- a/tests/clientlist/CMakeLists.txt +++ b/tests/clientlist/CMakeLists.txt @@ -41,8 +41,8 @@ add_executable(unittest ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/third_party/nlohmann/json.hpp diff --git a/tests/helperlib/CMakeLists.txt b/tests/helperlib/CMakeLists.txt index aedda2565..cdb686308 100644 --- a/tests/helperlib/CMakeLists.txt +++ b/tests/helperlib/CMakeLists.txt @@ -50,8 +50,8 @@ add_executable(test ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/third_party/nlohmann/json.hpp diff --git a/tests/helperlib/Makefile.in b/tests/helperlib/Makefile.in index fb1e54d88..4c167c94e 100644 --- a/tests/helperlib/Makefile.in +++ b/tests/helperlib/Makefile.in @@ -83,7 +83,7 @@ UNITTEST_OBJECTS = unittest.o \ crc.o \ crc8.o \ randpassword.o \ - vscp_aes.o \ + vscp-aes.o \ fastpbkdf2.o \ vscpmd5.o \ vscpbase64.o \ @@ -99,7 +99,7 @@ CONNECT_TEST_OBJECTS = connect_test.o \ crc.o \ crc8.o \ randpassword.o \ - vscp_aes.o \ + vscp-aes.o \ fastpbkdf2.o \ vscpmd5.o \ vscpbase64.o \ @@ -137,8 +137,8 @@ register.o: ../../src/vscp/common/register.cpp ../../src/vscp/common/register.h vscpdatetime.o: ../../src/vscp/common/vscpdatetime.cpp ../../src/vscp/common/vscpdatetime.h $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c ../../src/vscp/common/vscpdatetime.cpp -o $@ -vscp_aes.o: ../../src/common/vscp_aes.c ../../src/common/vscp_aes.h - $(CC) $(CFLAGS) -c ../../src/common/vscp_aes.c -o $@ +vscp-aes.o: ../../src/common/vscp-aes.c ../../src/common/vscp-aes.h + $(CC) $(CFLAGS) -c ../../src/common/vscp-aes.c -o $@ crc.o: ../../src/common/crc.c ../../src/common/crc.h $(CC) $(CFLAGS) -c ../../src/common/crc.c -o $@ diff --git a/tests/helperlib/Makefile.old b/tests/helperlib/Makefile.old index 8ce80b0d4..462ce4b3f 100644 --- a/tests/helperlib/Makefile.old +++ b/tests/helperlib/Makefile.old @@ -20,8 +20,8 @@ guid.o: ../../common/guid.cpp ../../common/guid.h vscpdatetime.o: ../../common/vscpdatetime.cpp ../../common/vscpdatetime.h $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c ../../common/vscpdatetime.cpp -o $@ -vscp_aes.o: ../../../common/vscp_aes.c ../../../common/vscp_aes.h - $(CC) $(CFLAGS) -c ../../../common/vscp_aes.c -o $@ +vscp-aes.o: ../../../common/vscp-aes.c ../../../common/vscp-aes.h + $(CC) $(CFLAGS) -c ../../../common/vscp-aes.c -o $@ crc.o: ../../../common/crc.c ../../../common/crc.h $(CC) $(CFLAGS) -c ../../../common/crc.c -o $@ diff --git a/tests/mdfparser/CMakeLists.txt b/tests/mdfparser/CMakeLists.txt index b740bd861..18a5f75b3 100644 --- a/tests/mdfparser/CMakeLists.txt +++ b/tests/mdfparser/CMakeLists.txt @@ -52,8 +52,8 @@ add_executable(test ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/third_party/nlohmann/json.hpp diff --git a/tests/register/CMakeLists.txt b/tests/register/CMakeLists.txt index a5b256d91..3459b7ef4 100644 --- a/tests/register/CMakeLists.txt +++ b/tests/register/CMakeLists.txt @@ -60,8 +60,8 @@ add_executable(test ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/sockettcp.h diff --git a/tests/userlist/CMakeLists.txt b/tests/userlist/CMakeLists.txt index 097e48a16..29212f171 100644 --- a/tests/userlist/CMakeLists.txt +++ b/tests/userlist/CMakeLists.txt @@ -41,8 +41,8 @@ add_executable(unittest ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/third_party/nlohmann/json.hpp diff --git a/tests/vscp-client-canal/CMakeLists.txt b/tests/vscp-client-canal/CMakeLists.txt index 770f3fc59..724ab8e8b 100644 --- a/tests/vscp-client-canal/CMakeLists.txt +++ b/tests/vscp-client-canal/CMakeLists.txt @@ -47,8 +47,8 @@ add_executable(test ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/third_party/nlohmann/json.hpp diff --git a/tests/vscp-client-mqtt/CMakeLists.txt b/tests/vscp-client-mqtt/CMakeLists.txt index aedda2565..cdb686308 100644 --- a/tests/vscp-client-mqtt/CMakeLists.txt +++ b/tests/vscp-client-mqtt/CMakeLists.txt @@ -50,8 +50,8 @@ add_executable(test ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/third_party/nlohmann/json.hpp diff --git a/tests/vscp-client-tcp/CMakeLists.txt b/tests/vscp-client-tcp/CMakeLists.txt index 796de92c4..e421dbac1 100644 --- a/tests/vscp-client-tcp/CMakeLists.txt +++ b/tests/vscp-client-tcp/CMakeLists.txt @@ -47,8 +47,8 @@ add_executable(test ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../third_party/fastpbkdf2/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../third_party/fastpbkdf2/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../third_party/nlohmann/include/nlohmann/json.hpp diff --git a/tests/vscp-client-ws1/CMakeLists.txt b/tests/vscp-client-ws1/CMakeLists.txt index 3ff1a5afb..eaa6f8cfe 100644 --- a/tests/vscp-client-ws1/CMakeLists.txt +++ b/tests/vscp-client-ws1/CMakeLists.txt @@ -54,8 +54,8 @@ add_executable(test ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/third_party/civetweb-1.13/include/civetweb.h diff --git a/tests/vscp-client-ws1/test-vscp-client-ws1.cpp b/tests/vscp-client-ws1/test-vscp-client-ws1.cpp index 29cbb5a5f..f71bbc09d 100644 --- a/tests/vscp-client-ws1/test-vscp-client-ws1.cpp +++ b/tests/vscp-client-ws1/test-vscp-client-ws1.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include "civetweb.h" #include // Needs C++11 -std=c++11 diff --git a/tests/vscp-client-ws2/CMakeLists.txt b/tests/vscp-client-ws2/CMakeLists.txt index 0c9018e5d..e3eac4ba7 100644 --- a/tests/vscp-client-ws2/CMakeLists.txt +++ b/tests/vscp-client-ws2/CMakeLists.txt @@ -54,8 +54,8 @@ add_executable(test ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/third_party/civetweb-1.13/include/civetweb.h diff --git a/tests/vscp-client-ws2/save_test-vscp-client-ws2.cpp b/tests/vscp-client-ws2/save_test-vscp-client-ws2.cpp index 1303d9a73..e137435c9 100644 --- a/tests/vscp-client-ws2/save_test-vscp-client-ws2.cpp +++ b/tests/vscp-client-ws2/save_test-vscp-client-ws2.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include "civetweb.h" #include // Needs C++11 -std=c++11 diff --git a/tests/vscp-client-ws2/test-vscp-client-ws2.cpp b/tests/vscp-client-ws2/test-vscp-client-ws2.cpp index c80dadb94..f9cb45b1f 100644 --- a/tests/vscp-client-ws2/test-vscp-client-ws2.cpp +++ b/tests/vscp-client-ws2/test-vscp-client-ws2.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include #include "civetweb.h" #include // Needs C++11 -std=c++11 diff --git a/tests/vscp-client/CMakeLists.txt b/tests/vscp-client/CMakeLists.txt index 8967cbf2c..a9aa903d8 100644 --- a/tests/vscp-client/CMakeLists.txt +++ b/tests/vscp-client/CMakeLists.txt @@ -47,8 +47,8 @@ add_executable(test ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/third_party/nlohmann/json.hpp diff --git a/tests/vscphelper/CMakeLists.txt b/tests/vscphelper/CMakeLists.txt index aedda2565..cdb686308 100644 --- a/tests/vscphelper/CMakeLists.txt +++ b/tests/vscphelper/CMakeLists.txt @@ -50,8 +50,8 @@ add_executable(test ${PROJECT_SOURCE_DIR}/../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../src/common/third_party/nlohmann/json.hpp diff --git a/tests/vscpremotetcpip/alltest/CMakeLists.txt b/tests/vscpremotetcpip/alltest/CMakeLists.txt index 6c746b72d..50266f48c 100644 --- a/tests/vscpremotetcpip/alltest/CMakeLists.txt +++ b/tests/vscpremotetcpip/alltest/CMakeLists.txt @@ -67,8 +67,8 @@ add_executable(unittest ${PROJECT_SOURCE_DIR}/../../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../../third_party/fastpbkdf2/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../../third_party/fastpbkdf2/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../../third_party/nlohmann/include/nlohmann/json.hpp diff --git a/tests/vscpremotetcpip/longtest/CMakeLists.txt b/tests/vscpremotetcpip/longtest/CMakeLists.txt index aaf5294ee..39650f1d8 100644 --- a/tests/vscpremotetcpip/longtest/CMakeLists.txt +++ b/tests/vscpremotetcpip/longtest/CMakeLists.txt @@ -62,8 +62,8 @@ add_executable(unittest ${PROJECT_SOURCE_DIR}/../../../src/common/crc.c ${PROJECT_SOURCE_DIR}/../../../src/common/crc8.h ${PROJECT_SOURCE_DIR}/../../../src/common/crc8.c - ${PROJECT_SOURCE_DIR}/../../../src/common/vscp_aes.h - ${PROJECT_SOURCE_DIR}/../../../src/common/vscp_aes.c + ${PROJECT_SOURCE_DIR}/../../../src/common/vscp-aes.h + ${PROJECT_SOURCE_DIR}/../../../src/common/vscp-aes.c ${PROJECT_SOURCE_DIR}/../../../src/common/fastpbkdf2.h ${PROJECT_SOURCE_DIR}/../../../src/common/fastpbkdf2.c ${PROJECT_SOURCE_DIR}/../../../src/common/third_party/nlohmann/json.hpp