Print

Print


@simonmichal commented on this pull request.



> @@ -39,11 +39,12 @@ find_package( CURL )
 
 if( ENABLE_CRYPTO )
   if( FORCE_ENABLED )
-    find_package( OpenSSL REQUIRED )
+    find_package( OpenSSL 1.0.2 REQUIRED )

Why do we require version 1.0.2?

> -
-  endif()
-endif()
-
-
-#-------------------------------------------------------------------------------
-# Check for the TLS support in the OpenSSL version that is available
-# (assume available if use of static libs is detected and the openssl version
-# is at least 1.0.2)
-#-------------------------------------------------------------------------------
-
-if ( OPENSSL_FOUND )
-
-  if( OPENSSL_USE_STATIC AND OPENSSL_GOOD_VERSION )
-
-    add_definitions( -DHAVE_TLS -DHAVE_TLS12 -DHAVE_TLS11 -DHAVE_TLS1 -DHAVE_DH_PADDED -DHAVE_DH_PADDED_FUNC )

I'm not sure if removing this file is the right thing to do, those definitions are used in the source code.

> -  if( OPENSSL_USE_STATIC AND OPENSSL_GOOD_VERSION )
-
-    add_definitions( -DHAVE_TLS -DHAVE_TLS12 -DHAVE_TLS11 -DHAVE_TLS1 -DHAVE_DH_PADDED -DHAVE_DH_PADDED_FUNC )
-
-  else()
-
-    set( CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES} )
-    set( CMAKE_REQUIRED_QUIET FALSE)
-
-    check_function_exists(TLS_method HAVE_TLS_FUNC)
-    check_symbol_exists(
-            TLS_method
-            ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h
-            HAVE_TLS_SYMB)
-    if( HAVE_TLS_FUNC AND HAVE_TLS_SYMB )
-        add_definitions( -DHAVE_TLS )

I'm not sure if removing this file is the right thing to do, those definitions are used in the source code.

> -    check_function_exists(TLS_method HAVE_TLS_FUNC)
-    check_symbol_exists(
-            TLS_method
-            ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h
-            HAVE_TLS_SYMB)
-    if( HAVE_TLS_FUNC AND HAVE_TLS_SYMB )
-        add_definitions( -DHAVE_TLS )
-    endif()
-
-    check_function_exists(TLSv1_2_method HAVE_TLS12_FUNC)
-    check_symbol_exists(
-            TLSv1_2_method
-            ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h
-            HAVE_TLS12_SYMB)
-    if( HAVE_TLS12_FUNC AND HAVE_TLS12_SYMB )
-        add_definitions( -DHAVE_TLS12 )

I'm not sure if removing this file is the right thing to do, those definitions are used in the source code.

> -    check_function_exists(TLSv1_2_method HAVE_TLS12_FUNC)
-    check_symbol_exists(
-            TLSv1_2_method
-            ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h
-            HAVE_TLS12_SYMB)
-    if( HAVE_TLS12_FUNC AND HAVE_TLS12_SYMB )
-        add_definitions( -DHAVE_TLS12 )
-    endif()
-
-    check_function_exists(TLSv1_1_method HAVE_TLS11_FUNC)
-    check_symbol_exists(
-            TLSv1_1_method
-            ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h
-            HAVE_TLS11_SYMB)
-    if( HAVE_TLS11_FUNC AND HAVE_TLS11_SYMB )
-        add_definitions( -DHAVE_TLS11 )

I'm not sure if removing this file is the right thing to do, those definitions are used in the source code.

> -    check_function_exists(TLSv1_1_method HAVE_TLS11_FUNC)
-    check_symbol_exists(
-            TLSv1_1_method
-            ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h
-            HAVE_TLS11_SYMB)
-    if( HAVE_TLS11_FUNC AND HAVE_TLS11_SYMB )
-        add_definitions( -DHAVE_TLS11 )
-    endif()
-
-    check_function_exists(TLSv1_method HAVE_TLS1_FUNC)
-    check_symbol_exists(
-            TLSv1_method
-            ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h
-            HAVE_TLS1_SYMB)
-    if( HAVE_TLS1_FUNC AND HAVE_TLS1_SYMB )
-        add_definitions( -DHAVE_TLS1 )

I'm not sure if removing this file is the right thing to do, those definitions are used in the source code.

> -    check_symbol_exists(
-            TLSv1_method
-            ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h
-            HAVE_TLS1_SYMB)
-    if( HAVE_TLS1_FUNC AND HAVE_TLS1_SYMB )
-        add_definitions( -DHAVE_TLS1 )
-    endif()
-
-    check_function_exists(DH_compute_key_padded HAVE_DH_PADDED_FUNC)
-    check_symbol_exists(
-            DH_compute_key_padded
-            ${OPENSSL_INCLUDE_DIR}/openssl/dh.h
-        HAVE_DH_PADDED_SYMB)
-    if( HAVE_DH_PADDED_FUNC)
-       if( HAVE_DH_PADDED_SYMB )
-         add_definitions( -DHAVE_DH_PADDED )

I'm not sure if removing this file is the right thing to do, those definitions are used in the source code.

> -            ${OPENSSL_INCLUDE_DIR}/openssl/ssl.h
-            HAVE_TLS1_SYMB)
-    if( HAVE_TLS1_FUNC AND HAVE_TLS1_SYMB )
-        add_definitions( -DHAVE_TLS1 )
-    endif()
-
-    check_function_exists(DH_compute_key_padded HAVE_DH_PADDED_FUNC)
-    check_symbol_exists(
-            DH_compute_key_padded
-            ${OPENSSL_INCLUDE_DIR}/openssl/dh.h
-        HAVE_DH_PADDED_SYMB)
-    if( HAVE_DH_PADDED_FUNC)
-       if( HAVE_DH_PADDED_SYMB )
-         add_definitions( -DHAVE_DH_PADDED )
-       else()
-         add_definitions( -DHAVE_DH_PADDED_FUNC )

I'm not sure if removing this file is the right thing to do, those definitions are used in the source code.

-- 
Reply to this email directly or view it on GitHub:
https://github.com/xrootd/xrootd/pull/1823#pullrequestreview-1175499432
You are receiving this because you are subscribed to this thread.

Message ID: <[log in to unmask]>

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the XROOTD-DEV list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=XROOTD-DEV&A=1