Avoid redefinition warning for OPENSSL_API_COMPAT (#5646)

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
eProsima · Feb 12, 2025 · e0c453b · e0c453b
1 parent 80347b5
commit e0c453b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 1 deletion.
diff --git a/src/cpp/rtps/transport/TCPAcceptorSecure.h b/src/cpp/rtps/transport/TCPAcceptorSecure.h
@@ -15,6 +15,9 @@
 #ifndef _FASTDDS_TCP_ACCEPTOR_SECURE_
 #define _FASTDDS_TCP_ACCEPTOR_SECURE_
 
+#ifdef OPENSSL_API_COMPAT
+#undef OPENSSL_API_COMPAT
+#endif // ifdef OPENSSL_API_COMPAT
 #define OPENSSL_API_COMPAT 10101
 
 #include <asio/ssl.hpp>

diff --git a/src/cpp/rtps/transport/TCPChannelResourceSecure.h b/src/cpp/rtps/transport/TCPChannelResourceSecure.h
@@ -15,6 +15,9 @@
 #ifndef _FASTDDS_TCP_CHANNEL_RESOURCE_SECURE_
 #define _FASTDDS_TCP_CHANNEL_RESOURCE_SECURE_
 
+#ifdef OPENSSL_API_COMPAT
+#undef OPENSSL_API_COMPAT
+#endif // ifdef OPENSSL_API_COMPAT
 #define OPENSSL_API_COMPAT 10101
 
 #include <asio.hpp>

diff --git a/src/cpp/rtps/transport/TCPTransportInterface.h b/src/cpp/rtps/transport/TCPTransportInterface.h
@@ -15,6 +15,13 @@
 #ifndef _FASTDDS_TCP_TRANSPORT_INTERFACE_H_
 #define _FASTDDS_TCP_TRANSPORT_INTERFACE_H_
 
+#if TLS_FOUND
+#ifdef OPENSSL_API_COMPAT
+#undef OPENSSL_API_COMPAT
+#endif // ifdef OPENSSL_API_COMPAT
+#define OPENSSL_API_COMPAT 10101
+#endif // if TLS_FOUND
+
 #include <vector>
 #include <map>
 #include <memory>
@@ -35,7 +42,6 @@
 #include <rtps/transport/TCPChannelResourceBasic.h>
 
 #if TLS_FOUND
-#define OPENSSL_API_COMPAT 10101
 #include <rtps/transport/TCPAcceptorSecure.h>
 #include <asio/ssl.hpp>
 #endif // if TLS_FOUND

diff --git a/src/cpp/security/artifact_providers/Pkcs11Provider.cpp b/src/cpp/security/artifact_providers/Pkcs11Provider.cpp
@@ -18,6 +18,9 @@
 
 // TODO This isn't a proper fix for compatibility with OpenSSL 3.0, but
 // suppresses the warnings until true OpenSSL 3.0 APIs can be used.
+#ifdef OPENSSL_API_COMPAT
+#undef OPENSSL_API_COMPAT
+#endif // ifdef OPENSSL_API_COMPAT
 #define OPENSSL_API_COMPAT 10101
 
 #include <security/artifact_providers/Pkcs11Provider.hpp>

diff --git a/src/cpp/security/authentication/PKIDH.cpp b/src/cpp/security/authentication/PKIDH.cpp
@@ -18,6 +18,9 @@
 
 // TODO This isn't a proper fix for compatibility with OpenSSL 3.0, but
 // suppresses the warnings until true OpenSSL 3.0 APIs can be used.
+#ifdef OPENSSL_API_COMPAT
+#undef OPENSSL_API_COMPAT
+#endif // ifdef OPENSSL_API_COMPAT
 #define OPENSSL_API_COMPAT 10101
 
 #include <security/authentication/PKIDH.h>

diff --git a/test/unittest/security/authentication/BuiltinPKIDHTests.cpp b/test/unittest/security/authentication/BuiltinPKIDHTests.cpp
@@ -14,6 +14,9 @@
 
 // TODO This isn't a proper fix for compatibility with OpenSSL 3.0, but
 // suppresses the warnings until true OpenSSL 3.0 APIs can be used.
+#ifdef OPENSSL_API_COMPAT
+#undef OPENSSL_API_COMPAT
+#endif // ifdef OPENSSL_API_COMPAT
 #define OPENSSL_API_COMPAT 10101
 
 #include <iostream>