Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Additional WITH_OPENSSL3=TRUE fixes #1526

Merged
merged 1 commit into from
Oct 6, 2021
Merged

Additional WITH_OPENSSL3=TRUE fixes #1526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/XrdCrypto.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ set_target_properties(
if( WITH_OPENSSL3 )
set( XrdCryptoLiteSources
XrdCrypto/XrdCryptoLite.cc XrdCrypto/XrdCryptoLite.hh
openssl/XrdCrypto/XrdCryptoLite_bf32.cc )
XrdCrypto/openssl3/XrdCryptoLite_bf32.cc )
else()
set( XrdCryptoLiteSources
XrdCrypto/XrdCryptoLite.cc XrdCrypto/XrdCryptoLite.hh
Expand All @@ -83,8 +83,7 @@ endif()
add_library(
XrdCryptoLite
SHARED
XrdCrypto/XrdCryptoLite.cc XrdCrypto/XrdCryptoLite.hh
XrdCrypto/XrdCryptoLite_bf32.cc )
${XrdCryptoLiteSources} )

if( BUILD_CRYPTO )
target_link_libraries(
Expand Down
33 changes: 24 additions & 9 deletions src/XrdHttp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,35 @@ if( BUILD_HTTP )
# The XrdHttp library
#-----------------------------------------------------------------------------
include_directories( ${OPENSSL_INCLUDE_DIR} )


if( WITH_OPENSSL3 )
set( XrdHttpSources
XrdHttp/XrdHttpProtocol.cc XrdHttp/XrdHttpProtocol.hh
XrdHttp/XrdHttpSecurity.cc
XrdHttp/XrdHttpReq.cc XrdHttp/XrdHttpReq.hh
XrdHttp/XrdHttpSecXtractor.hh
XrdHttp/XrdHttpExtHandler.cc XrdHttp/XrdHttpExtHandler.hh
XrdHttp/XrdHttpStatic.hh
XrdHttp/XrdHttpTrace.hh
XrdHttp/openssl3/XrdHttpUtils.cc XrdHttp/XrdHttpUtils.hh )
else()
set( XrdHttpSources
XrdHttp/XrdHttpProtocol.cc XrdHttp/XrdHttpProtocol.hh
XrdHttp/XrdHttpSecurity.cc
XrdHttp/XrdHttpReq.cc XrdHttp/XrdHttpReq.hh
XrdHttp/XrdHttpSecXtractor.hh
XrdHttp/XrdHttpExtHandler.cc XrdHttp/XrdHttpExtHandler.hh
XrdHttp/XrdHttpStatic.hh
XrdHttp/XrdHttpTrace.hh
XrdHttp/XrdHttpUtils.cc XrdHttp/XrdHttpUtils.hh )
endif()

# Note this is marked as a shared library as XrdHttp plugins are expected to
# link against this for the XrdHttpExt class implementations.
add_library(
${LIB_XRD_HTTP_UTILS}
SHARED
XrdHttp/XrdHttpProtocol.cc XrdHttp/XrdHttpProtocol.hh
XrdHttp/XrdHttpSecurity.cc
XrdHttp/XrdHttpReq.cc XrdHttp/XrdHttpReq.hh
XrdHttp/XrdHttpSecXtractor.hh
XrdHttp/XrdHttpExtHandler.cc XrdHttp/XrdHttpExtHandler.hh
XrdHttp/XrdHttpStatic.hh
XrdHttp/XrdHttpTrace.hh
XrdHttp/XrdHttpUtils.cc XrdHttp/XrdHttpUtils.hh )
${XrdHttpSources} )

add_library(
${MOD_XRD_HTTP}
Expand Down
13 changes: 11 additions & 2 deletions src/XrdSec.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,20 @@ set_target_properties(
#-------------------------------------------------------------------------------
# The XrdSecpwd module
#-------------------------------------------------------------------------------
if( WITH_OPENSSL3 )
set( XrdSecProtectSources
XrdSec/openssl3/XrdSecProtect.cc XrdSec/XrdSecProtect.hh
XrdSec/XrdSecProtector.cc XrdSec/XrdSecProtector.hh )
else()
set( XrdSecProtectSources
XrdSec/XrdSecProtect.cc XrdSec/XrdSecProtect.hh
XrdSec/XrdSecProtector.cc XrdSec/XrdSecProtector.hh )
endif()

add_library(
${LIB_XRD_SEC_PROT}
MODULE
XrdSec/XrdSecProtect.cc XrdSec/XrdSecProtect.hh
XrdSec/XrdSecProtector.cc XrdSec/XrdSecProtector.hh )
${XrdSecProtectSources} )

if( BUILD_CRYPTO )
target_link_libraries(
Expand Down
112 changes: 88 additions & 24 deletions src/XrdUtils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ set( XRD_ZCRC32_SOVERSION 3 )
#-------------------------------------------------------------------------------
# The XrdUtils library
#-------------------------------------------------------------------------------
add_library(
XrdUtils
SHARED

#-----------------------------------------------------------------------------
# XProtocol
#-----------------------------------------------------------------------------
set ( XProtocolSources
XProtocol/XProtocol.cc XProtocol/XProtocol.hh
)

#-----------------------------------------------------------------------------
# XrdSys
#-----------------------------------------------------------------------------
set ( XrdSysSources
XrdSys/XrdSysAtomics.hh
XrdSys/XrdSysDir.cc XrdSys/XrdSysDir.hh
XrdSys/XrdSysE2T.cc XrdSys/XrdSysE2T.hh
Expand Down Expand Up @@ -56,40 +56,77 @@ add_library(
XrdSys/XrdSysUtils.cc XrdSys/XrdSysUtils.hh
XrdSys/XrdSysXAttr.cc XrdSys/XrdSysXAttr.hh
XrdSys/XrdSysXSLock.cc XrdSys/XrdSysXSLock.hh
)

#-----------------------------------------------------------------------------
# XrdTls
#-----------------------------------------------------------------------------
XrdTls/XrdTls.cc XrdTls/XrdTls.hh
XrdTls/XrdTlsContext.cc XrdTls/XrdTlsContext.hh
XrdTls/XrdTlsHostcheck.icc XrdTls/XrdTlsHostcheck.hh
XrdTls/XrdTlsNotary.cc XrdTls/XrdTlsNotary.hh
XrdTls/XrdTlsNotaryUtils.icc XrdTls/XrdTlsNotaryUtils.hh
XrdTls/XrdTlsPeerCerts.cc XrdTls/XrdTlsPeerCerts.hh
XrdTls/XrdTlsSocket.cc XrdTls/XrdTlsSocket.hh
XrdTls/XrdTlsTempCA.cc XrdTls/XrdTlsTempCA.hh
if ( WITH_OPENSSL3 )
set ( XrdTlsSources
XrdTls/XrdTls.cc XrdTls/XrdTls.hh
XrdTls/openssl3/XrdTlsContext.cc XrdTls/XrdTlsContext.hh
XrdTls/XrdTlsHostcheck.icc XrdTls/XrdTlsHostcheck.hh
XrdTls/XrdTlsNotary.cc XrdTls/XrdTlsNotary.hh
XrdTls/XrdTlsNotaryUtils.icc XrdTls/XrdTlsNotaryUtils.hh
XrdTls/XrdTlsPeerCerts.cc XrdTls/XrdTlsPeerCerts.hh
XrdTls/XrdTlsSocket.cc XrdTls/XrdTlsSocket.hh
XrdTls/XrdTlsTempCA.cc XrdTls/XrdTlsTempCA.hh
)
else()
set ( XrdTlsSources
XrdTls/XrdTls.cc XrdTls/XrdTls.hh
XrdTls/XrdTlsContext.cc XrdTls/XrdTlsContext.hh
XrdTls/XrdTlsHostcheck.icc XrdTls/XrdTlsHostcheck.hh
XrdTls/XrdTlsNotary.cc XrdTls/XrdTlsNotary.hh
XrdTls/XrdTlsNotaryUtils.icc XrdTls/XrdTlsNotaryUtils.hh
XrdTls/XrdTlsPeerCerts.cc XrdTls/XrdTlsPeerCerts.hh
XrdTls/XrdTlsSocket.cc XrdTls/XrdTlsSocket.hh
XrdTls/XrdTlsTempCA.cc XrdTls/XrdTlsTempCA.hh
)
endif()

#-----------------------------------------------------------------------------
# XrdCrypto: linking against a few functions that are useful for XrdTls; avoids
# linking against all of libXrdCryptossl in XrdUtils
#-----------------------------------------------------------------------------
XrdCrypto/XrdCryptosslAux.cc XrdCrypto/XrdCryptosslAux.hh
XrdCrypto/XrdCryptosslX509.cc XrdCrypto/XrdCryptosslX509.hh
XrdCrypto/XrdCryptoX509.cc XrdCrypto/XrdCryptoX509.hh
XrdCrypto/XrdCryptoX509Chain.cc XrdCrypto/XrdCryptoX509Chain.hh
XrdCrypto/XrdCryptosslRSA.cc XrdCrypto/XrdCryptosslRSA.hh
XrdCrypto/XrdCryptoRSA.cc XrdCrypto/XrdCryptoRSA.hh
XrdCrypto/XrdCryptosslgsiAux.hh XrdCrypto/XrdCryptosslgsiAux.cc
XrdCrypto/XrdCryptosslX509Req.cc XrdCrypto/XrdCryptosslX509Req.hh
XrdCrypto/XrdCryptoX509Req.cc XrdCrypto/XrdCryptoX509Req.hh
XrdCrypto/XrdCryptoAux.cc XrdCrypto/XrdCryptoAux.hh
XrdCrypto/XrdCryptosslX509Crl.cc XrdCrypto/XrdCryptosslX509Crl.hh
XrdCrypto/XrdCryptoX509Crl.cc XrdCrypto/XrdCryptoX509Crl.hh
XrdCrypto/XrdCryptoTrace.hh
if ( WITH_OPENSSL3 )
set ( XrdCryptoSources
XrdCrypto/openssl3/XrdCryptosslAux.cc XrdCrypto/XrdCryptosslAux.hh
XrdCrypto/openssl3/XrdCryptosslX509.cc XrdCrypto/XrdCryptosslX509.hh
XrdCrypto/XrdCryptoX509.cc XrdCrypto/XrdCryptoX509.hh
XrdCrypto/XrdCryptoX509Chain.cc XrdCrypto/XrdCryptoX509Chain.hh
XrdCrypto/openssl3/XrdCryptosslRSA.cc XrdCrypto/XrdCryptosslRSA.hh
XrdCrypto/XrdCryptoRSA.cc XrdCrypto/XrdCryptoRSA.hh
XrdCrypto/openssl3/XrdCryptosslgsiAux.cc XrdCrypto/XrdCryptosslgsiAux.hh
XrdCrypto/XrdCryptosslX509Req.cc XrdCrypto/XrdCryptosslX509Req.hh
XrdCrypto/XrdCryptoX509Req.cc XrdCrypto/XrdCryptoX509Req.hh
XrdCrypto/XrdCryptoAux.cc XrdCrypto/XrdCryptoAux.hh
XrdCrypto/XrdCryptosslX509Crl.cc XrdCrypto/XrdCryptosslX509Crl.hh
XrdCrypto/XrdCryptoX509Crl.cc XrdCrypto/XrdCryptoX509Crl.hh
XrdCrypto/XrdCryptoTrace.hh
)
else()
set ( XrdCryptoSources
XrdCrypto/XrdCryptosslAux.cc XrdCrypto/XrdCryptosslAux.hh
XrdCrypto/XrdCryptosslX509.cc XrdCrypto/XrdCryptosslX509.hh
XrdCrypto/XrdCryptoX509.cc XrdCrypto/XrdCryptoX509.hh
XrdCrypto/XrdCryptoX509Chain.cc XrdCrypto/XrdCryptoX509Chain.hh
XrdCrypto/XrdCryptosslRSA.cc XrdCrypto/XrdCryptosslRSA.hh
XrdCrypto/XrdCryptoRSA.cc XrdCrypto/XrdCryptoRSA.hh
XrdCrypto/XrdCryptosslgsiAux.cc XrdCrypto/XrdCryptosslgsiAux.hh
XrdCrypto/XrdCryptosslX509Req.cc XrdCrypto/XrdCryptosslX509Req.hh
XrdCrypto/XrdCryptoX509Req.cc XrdCrypto/XrdCryptoX509Req.hh
XrdCrypto/XrdCryptoAux.cc XrdCrypto/XrdCryptoAux.hh
XrdCrypto/XrdCryptosslX509Crl.cc XrdCrypto/XrdCryptosslX509Crl.hh
XrdCrypto/XrdCryptoX509Crl.cc XrdCrypto/XrdCryptoX509Crl.hh
XrdCrypto/XrdCryptoTrace.hh
)
endif()

#-----------------------------------------------------------------------------
# XrdOuc
#-----------------------------------------------------------------------------
set ( XrdOucSources
XrdOuc/XrdOuca2x.cc XrdOuc/XrdOuca2x.hh
XrdOuc/XrdOucArgs.cc XrdOuc/XrdOucArgs.hh
XrdOuc/XrdOucBackTrace.cc XrdOuc/XrdOucBackTrace.hh
Expand Down Expand Up @@ -148,10 +185,12 @@ add_library(
XrdOuc/XrdOucTList.hh
XrdOuc/XrdOucXAttr.hh
XrdOuc/XrdOucEnum.hh
)

#-----------------------------------------------------------------------------
# XrdNet
#-----------------------------------------------------------------------------
set ( XrdNetSources
XrdNet/XrdNet.cc XrdNet/XrdNet.hh
XrdNet/XrdNetOpts.hh
XrdNet/XrdNetPeer.hh
Expand All @@ -168,10 +207,12 @@ add_library(
XrdNet/XrdNetSecurity.cc XrdNet/XrdNetSecurity.hh
XrdNet/XrdNetSocket.cc XrdNet/XrdNetSocket.hh
XrdNet/XrdNetUtils.cc XrdNet/XrdNetUtils.hh
)

#-----------------------------------------------------------------------------
# XrdSut
#-----------------------------------------------------------------------------
set ( XrdSutSources
XrdSut/XrdSutAux.cc XrdSut/XrdSutAux.hh
XrdSut/XrdSutPFCache.cc XrdSut/XrdSutPFCache.hh
XrdSut/XrdSutBucket.cc XrdSut/XrdSutBucket.hh
Expand All @@ -182,10 +223,12 @@ add_library(
XrdSut/XrdSutPFEntry.cc XrdSut/XrdSutPFEntry.hh
XrdSut/XrdSutRndm.cc XrdSut/XrdSutRndm.hh
XrdSut/XrdSutTrace.hh
)

#-----------------------------------------------------------------------------
# Xrd
#-----------------------------------------------------------------------------
set ( XrdSources
Xrd/XrdBuffer.cc Xrd/XrdBuffer.hh
Xrd/XrdBuffXL.cc Xrd/XrdBuffXL.hh
Xrd/XrdInet.cc Xrd/XrdInet.hh
Expand All @@ -208,10 +251,12 @@ add_library(
Xrd/XrdScheduler.cc Xrd/XrdScheduler.hh
Xrd/XrdSendQ.cc Xrd/XrdSendQ.hh
Xrd/XrdTrace.hh
)

#-----------------------------------------------------------------------------
# XrdCks
#-----------------------------------------------------------------------------
set ( XrdCksSources
XrdCks/XrdCksAssist.cc XrdCks/XrdCksAssist.hh
XrdCks/XrdCksCalccrc32.cc XrdCks/XrdCksCalccrc32.hh
XrdCks/XrdCksCalccrc32C.cc XrdCks/XrdCksCalccrc32C.hh
Expand All @@ -225,18 +270,22 @@ add_library(
XrdCks/XrdCksData.hh
XrdCks/XrdCks.hh
XrdCks/XrdCksXAttr.hh
)

#-----------------------------------------------------------------------------
# XrdRmc
#-----------------------------------------------------------------------------
set ( XrdRmcSources
XrdRmc/XrdRmc.cc XrdRmc/XrdRmc.hh
XrdRmc/XrdRmcData.cc XrdRmc/XrdRmcData.hh
XrdRmc/XrdRmcReal.cc XrdRmc/XrdRmcReal.hh
XrdRmc/XrdRmcSlot.hh
)

#-----------------------------------------------------------------------------
# XrdSec
#-----------------------------------------------------------------------------
set ( XrdSecSources
XrdSec/XrdSecEntity.cc XrdSec/XrdSecEntity.hh
XrdSec/XrdSecEntityAttr.cc XrdSec/XrdSecEntityAttr.hh
XrdSec/XrdSecEntityXtra.cc XrdSec/XrdSecEntityXtra.hh
Expand All @@ -246,7 +295,22 @@ add_library(
XrdSecsss/XrdSecsssID.cc XrdSecsss/XrdSecsssID.hh
XrdSecsss/XrdSecsssKT.cc XrdSecsss/XrdSecsssKT.hh
XrdSecsss/XrdSecsssMap.hh
)

add_library(
XrdUtils
SHARED
${XProtocolSources}
${XrdSysSources}
${XrdTlsSources}
${XrdCryptoSources}
${XrdOucSources}
${XrdNetSources}
${XrdSutSources}
${XrdSources}
${XrdCksSources}
${XrdRmcSources}
${XrdSecSources}
)

target_link_libraries(
Expand Down