feat(httpsVerifier): moves the header files (related to certificate v…

…erification) to the 'src' directory.
wazuh · Jan 20, 2025 · 541c719 · 541c719
1 parent 54d7bcc
commit 541c719
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 24 deletions.
diff --git a/src/agent/communicator/src/cert_store_utils_mac.hpp b/src/agent/communicator/src/cert_store_utils_mac.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <icert_store_utils_mac.hpp>
+#include "icert_store_utils_mac.hpp"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/Security.h>

diff --git a/src/agent/communicator/src/cert_store_utils_win.hpp b/src/agent/communicator/src/cert_store_utils_win.hpp
@@ -9,7 +9,7 @@
 #include <wincrypt.h>
 // clang-format on
 
-#include <icert_store_utils_win.hpp>
+#include "icert_store_utils_win.hpp"
 
 #include <string>
 

diff --git a/src/agent/communicator/src/https_socket.hpp b/src/agent/communicator/src/https_socket.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <https_socket_verify_utils.hpp>
+#include "https_socket_verify_utils.hpp"
 #include <ihttp_socket.hpp>
 #include <logger.hpp>
 

diff --git a/...tor/include/https_socket_verify_utils.hpp → ...nicator/src/https_socket_verify_utils.hpp b/...tor/include/https_socket_verify_utils.hpp → ...nicator/src/https_socket_verify_utils.hpp
diff --git a/src/agent/communicator/src/https_socket_verify_utils_lin.cpp b/src/agent/communicator/src/https_socket_verify_utils_lin.cpp
@@ -1,5 +1,5 @@
+#include "https_socket_verify_utils.hpp"
 #include <boost/asio/ssl.hpp>
-#include <https_socket_verify_utils.hpp>
 
 #include <string>
 

diff --git a/src/agent/communicator/src/https_socket_verify_utils_mac.cpp b/src/agent/communicator/src/https_socket_verify_utils_mac.cpp
@@ -1,9 +1,9 @@
 #include "cert_store_utils_mac.hpp"
+#include "https_socket_verify_utils.hpp"
+#include "https_verifier_mac.hpp"
+#include "icert_store_utils_mac.hpp"
+#include "ix509_utils.hpp"
 #include "x509_utils.hpp"
-#include <https_socket_verify_utils.hpp>
-#include <https_verifier_mac.hpp>
-#include <icert_store_utils_mac.hpp>
-#include <ix509_utils.hpp>
 
 #include <boost/asio/ssl.hpp>
 

diff --git a/src/agent/communicator/src/https_socket_verify_utils_win.cpp b/src/agent/communicator/src/https_socket_verify_utils_win.cpp
@@ -8,11 +8,11 @@
 // clang-format on
 
 #include "cert_store_utils_win.hpp"
+#include "https_socket_verify_utils.hpp"
 #include "https_verifier_win.hpp"
+#include "icert_store_utils_win.hpp"
+#include "ix509_utils.hpp"
 #include "x509_utils.hpp"
-#include <https_socket_verify_utils.hpp>
-#include <icert_store_utils_win.hpp>
-#include <ix509_utils.hpp>
 
 #include <boost/asio/ssl.hpp>
 

diff --git a/src/agent/communicator/src/https_verifier_mac.cpp b/src/agent/communicator/src/https_verifier_mac.cpp
@@ -1,9 +1,9 @@
+#include "https_verifier_mac.hpp"
 #include "cert_store_utils_mac.hpp"
+#include "https_socket_verify_utils.hpp"
+#include "icert_store_utils_mac.hpp"
+#include "ix509_utils.hpp"
 #include "x509_utils.hpp"
-#include <https_socket_verify_utils.hpp>
-#include <https_verifier_mac.hpp>
-#include <icert_store_utils_mac.hpp>
-#include <ix509_utils.hpp>
 #include <logger.hpp>
 
 #include <CoreFoundation/CoreFoundation.h>

diff --git a/...mmunicator/include/https_verifier_mac.hpp → ...t/communicator/src/https_verifier_mac.hpp b/...mmunicator/include/https_verifier_mac.hpp → ...t/communicator/src/https_verifier_mac.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <icert_store_utils_mac.hpp>
-#include <ix509_utils.hpp>
+#include "icert_store_utils_mac.hpp"
+#include "ix509_utils.hpp"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/Security.h>

diff --git a/src/agent/communicator/src/https_verifier_win.cpp b/src/agent/communicator/src/https_verifier_win.cpp
@@ -9,9 +9,9 @@
 
 #include "https_verifier_win.hpp"
 #include "cert_store_utils_win.hpp"
+#include "icert_store_utils_win.hpp"
+#include "ix509_utils.hpp"
 #include "x509_utils.hpp"
-#include <icert_store_utils_win.hpp>
-#include <ix509_utils.hpp>
 #include <logger.hpp>
 
 #include <boost/asio/ssl.hpp>

diff --git a/...nicator/include/icert_store_utils_mac.hpp → ...ommunicator/src/icert_store_utils_mac.hpp b/...nicator/include/icert_store_utils_mac.hpp → ...ommunicator/src/icert_store_utils_mac.hpp
diff --git a/...nicator/include/icert_store_utils_win.hpp → ...ommunicator/src/icert_store_utils_win.hpp b/...nicator/include/icert_store_utils_win.hpp → ...ommunicator/src/icert_store_utils_win.hpp
diff --git a/...gent/communicator/include/ix509_utils.hpp → src/agent/communicator/src/ix509_utils.hpp b/...gent/communicator/include/ix509_utils.hpp → src/agent/communicator/src/ix509_utils.hpp
diff --git a/src/agent/communicator/src/x509_utils.hpp b/src/agent/communicator/src/x509_utils.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ix509_utils.hpp>
+#include "ix509_utils.hpp"
 
 #include <boost/asio/ssl.hpp>
 

diff --git a/src/agent/communicator/tests/CMakeLists.txt b/src/agent/communicator/tests/CMakeLists.txt
@@ -21,7 +21,7 @@ if(WIN32)
 elseif(APPLE)
     add_executable(https_verifier_test https_verifier_mac_test.cpp)
     configure_target(https_verifier_test)
-    target_include_directories(https_verifier_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include)
+    target_include_directories(https_verifier_test PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../src)
     target_link_libraries(https_verifier_test PUBLIC Communicator GTest::gtest GTest::gtest_main GTest::gmock GTest::gmock_main)
     add_test(NAME HttpsVerifierTest COMMAND https_verifier_test)
 else()

diff --git a/src/agent/communicator/tests/mocks/mock_cert_store_utils_mac.hpp b/src/agent/communicator/tests/mocks/mock_cert_store_utils_mac.hpp
@@ -1,6 +1,6 @@
 #include <gmock/gmock.h>
 
-#include <icert_store_utils_mac.hpp>
+#include "icert_store_utils_mac.hpp"
 
 class MockCertStoreUtils : public https_socket_verify_utils::ICertificateStoreUtilsMac
 {

diff --git a/src/agent/communicator/tests/mocks/mock_cert_store_utils_win.hpp b/src/agent/communicator/tests/mocks/mock_cert_store_utils_win.hpp
@@ -1,6 +1,6 @@
 #include <gmock/gmock.h>
 
-#include <icert_store_utils_win.hpp>
+#include "icert_store_utils_win.hpp"
 
 class MockCertStoreUtils : public https_socket_verify_utils::ICertificateStoreUtilsWin
 {

diff --git a/src/agent/communicator/tests/mocks/mock_x509_utils.hpp b/src/agent/communicator/tests/mocks/mock_x509_utils.hpp
@@ -1,6 +1,6 @@
 #include <gmock/gmock.h>
 
-#include <ix509_utils.hpp>
+#include "ix509_utils.hpp"
 
 class MockX509Utils : public https_socket_verify_utils::ICertificateX509Utils
 {