Addressing comments

Author: Santhosha-bk

submodules/CMakeLists.txt

@@ -320,11 +320,11 @@ else()
         COMMENT "OpenSSL build"
     )
 
-    if (QUIC_USE_SYSTEM_LIBCRYPTO AND NOT (CX_PLATFORM STREQUAL "linux" AND QUIC_TLS_LIB STREQUAL "openssl"))
+    if (QUIC_USE_SYSTEM_LIBCRYPTO AND QUIC_TLS_LIB STREQUAL "quictls")
         # OpenSSL 3 uses different sources for static and dynamic libraries.
         # That is ok if you use either one consistently but it fails to link when we use dynamic crypto with static ssl.
         # To fix that we need little hackery - see quictls/ssl/build.info.
-        # Skip only linux+openssl where both libssl and libcrypto are linked dynamically.
+        # This is required for quictls hybrid linking when using system libcrypto.
         add_custom_command(
             OUTPUT ${LIBSSL_PATH}
             OUTPUT ${LIBCRYPTO_PATH}
@@ -356,36 +356,40 @@ else()
     )
 
     if (QUIC_USE_SYSTEM_LIBCRYPTO)
-        include(FindOpenSSL)
-        if (OPENSSL_FOUND)
-            # Get Major.Minor so 3.0 can match 3.0.2.
-            # We cannot use VERSION_GREATER as 3.0 would work for 1.1.1 but they are not compatible.
-            string(FIND ${OPENSSL_VERSION} "." VERSIONLEN REVERSE)
-            string(SUBSTRING ${OPENSSL_VERSION} 0 ${VERSIONLEN} OPENSSL_MAJORMINOR)
-            string(FIND ${OPENSSL_VERSION} "." VERSIONLEN)
-            string(SUBSTRING ${OPENSSL_VERSION} 0 ${VERSIONLEN} OPENSSL_MAJOR)
-
-            if (OPENSSL_VERSION VERSION_EQUAL EXPECTED_OPENSSL_VERSION OR OPENSSL_MAJORMINOR VERSION_EQUAL EXPECTED_OPENSSL_VERSION OR
-                # 3.1 is compatible with 3.0, 3.2 and beyond maybe as well.
-                (EXPECTED_OPENSSL_VERSION VERSION_EQUAL "3.0" AND OPENSSL_MAJOR EQUAL "3"))
-                target_link_libraries(OpenSSLQuic INTERFACE OpenSSL::Crypto)
-
-                if (CX_PLATFORM STREQUAL "linux" AND QUIC_TLS_LIB STREQUAL "openssl")
-                    # Linux openssl uses libssl and libcrypto system libraries dynamically.
-                    if (OPENSSL_VERSION VERSION_GREATER_EQUAL "3.5.0")
-                        target_link_libraries(OpenSSLQuic INTERFACE OpenSSL::SSL)
-                    else()
-                        message(FATAL_ERROR "OpenSSL 3.5.0 or later required for openssl TLS provider on Linux, found ${OPENSSL_VERSION}")
-                    endif()
+        if (QUIC_TLS_LIB STREQUAL "openssl")
+            include(FindOpenSSL)
+            if (OPENSSL_FOUND)
+                if (OPENSSL_VERSION VERSION_GREATER_EQUAL "3.5.0")
+                    # openssl TLS provider links both system libcrypto and libssl dynamically.
+                    target_link_libraries(OpenSSLQuic INTERFACE OpenSSL::Crypto OpenSSL::SSL)
                 else()
-                    # Preserve existing hybrid behavior everywhere else.
+                    message(FATAL_ERROR "OpenSSL 3.5.0 or later required for openssl TLS provider, found ${OPENSSL_VERSION}")
+                endif()
+            else()
+                message(FATAL_ERROR "System OpenSSL not found when requested")
+            endif()
+        elseif(QUIC_TLS_LIB STREQUAL "quictls")
+            include(FindOpenSSL)
+            if (OPENSSL_FOUND)
+                # Get Major.Minor so 3.0 can match 3.0.2.
+                # We cannot use VERSION_GREATER as 3.0 would work for 1.1.1 but they are not compatible.
+                string(FIND ${OPENSSL_VERSION} "." VERSIONLEN REVERSE)
+                string(SUBSTRING ${OPENSSL_VERSION} 0 ${VERSIONLEN} OPENSSL_MAJORMINOR)
+                string(FIND ${OPENSSL_VERSION} "." VERSIONLEN)
+                string(SUBSTRING ${OPENSSL_VERSION} 0 ${VERSIONLEN} OPENSSL_MAJOR)
+
+                if (OPENSSL_VERSION VERSION_EQUAL EXPECTED_OPENSSL_VERSION OR OPENSSL_MAJORMINOR VERSION_EQUAL EXPECTED_OPENSSL_VERSION OR
+                    # 3.1 is compatible with 3.0, 3.2 and beyond maybe as well.
+                    (EXPECTED_OPENSSL_VERSION VERSION_EQUAL "3.0" AND OPENSSL_MAJOR EQUAL "3"))
+                    target_link_libraries(OpenSSLQuic INTERFACE OpenSSL::Crypto)
+                    # Preserve existing hybrid behavior for quictls.
                     target_link_libraries(OpenSSLQuic INTERFACE ${LIBSSL_PATH})
+                else()
+                    message(FATAL_ERROR "OpenSSL ${EXPECTED_OPENSSL_VERSION} not found, found ${OPENSSL_VERSION}")
                 endif()
             else()
-                message(FATAL_ERROR "OpenSSL ${EXPECTED_OPENSSL_VERSION} not found, found ${OPENSSL_VERSION}")
+                message(FATAL_ERROR "System OpenSSL not found when requested")
             endif()
-        else()
-            message(FATAL_ERROR "System OpenSSL not found when requested")
         endif()
     else()
         target_link_libraries(