Commit 709cf76f authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

openssl: remove all uses of USE_SSLEAY 

SSLeay was the name of the library that was subsequently turned into
OpenSSL many moons ago (1999). curl does not work with the old SSLeay
library since years. This is now reflected by only using USE_OPENSSL in
code that depends on OpenSSL.
parent 1a62b6e6

CMakeLists.txt

+0 −3
Original line number Original line Diff line number Diff line
@@ -298,7 +298,6 @@ endif() 
option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ON)

option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ON)

mark_as_advanced(CMAKE_USE_OPENSSL)

mark_as_advanced(CMAKE_USE_OPENSSL)





set(USE_SSLEAY OFF)

set(USE_OPENSSL OFF)

set(USE_OPENSSL OFF)

set(HAVE_LIBCRYPTO OFF)

set(HAVE_LIBCRYPTO OFF)

set(HAVE_LIBSSL OFF)

set(HAVE_LIBSSL OFF)
@@ -307,7 +306,6 @@ if(CMAKE_USE_OPENSSL) 
  find_package(OpenSSL)

  find_package(OpenSSL)

  if(OPENSSL_FOUND)

  if(OPENSSL_FOUND)

    list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})

    list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})

    set(USE_SSLEAY ON)

    set(USE_OPENSSL ON)

    set(USE_OPENSSL ON)

    set(HAVE_LIBCRYPTO ON)

    set(HAVE_LIBCRYPTO ON)

    set(HAVE_LIBSSL ON)

    set(HAVE_LIBSSL ON)
@@ -754,7 +752,6 @@ if(CMAKE_USE_OPENSSL) 
    HAVE_CRYPTO_CLEANUP_ALL_EX_DATA)

    HAVE_CRYPTO_CLEANUP_ALL_EX_DATA)

  if(HAVE_LIBCRYPTO AND HAVE_LIBSSL)

  if(HAVE_LIBCRYPTO AND HAVE_LIBSSL)

    set(USE_OPENSSL 1)

    set(USE_OPENSSL 1)

    set(USE_SSLEAY 1)

  endif(HAVE_LIBCRYPTO AND HAVE_LIBSSL)

  endif(HAVE_LIBCRYPTO AND HAVE_LIBSSL)

endif(CMAKE_USE_OPENSSL)

endif(CMAKE_USE_OPENSSL)

check_symbol_exists(gmtime_r      "${CURL_INCLUDES}" HAVE_GMTIME_R)

check_symbol_exists(gmtime_r      "${CURL_INCLUDES}" HAVE_GMTIME_R)

configure.ac

+7 −13
Original line number Original line Diff line number Diff line
@@ -1527,7 +1527,7 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then 




    else

    else





      dnl Have the libraries--check for SSLeay/OpenSSL headers

      dnl Have the libraries--check for OpenSSL headers

      AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \

      AC_CHECK_HEADERS(openssl/x509.h openssl/rsa.h openssl/crypto.h \

                       openssl/pem.h openssl/ssl.h openssl/err.h,

                       openssl/pem.h openssl/ssl.h openssl/err.h,

        curl_ssl_msg="enabled (OpenSSL)"

        curl_ssl_msg="enabled (OpenSSL)"
@@ -1551,17 +1551,11 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then 
    fi

    fi





    if test X"$OPENSSL_ENABLED" = X"1"; then

    if test X"$OPENSSL_ENABLED" = X"1"; then

       AC_DEFINE(USE_SSLEAY, 1, [if SSL is enabled])



       dnl is there a pkcs12.h header present?

       dnl is there a pkcs12.h header present?

       AC_CHECK_HEADERS(openssl/pkcs12.h)

       AC_CHECK_HEADERS(openssl/pkcs12.h)

    else

    else

       LIBS="$CLEANLIBS"

       LIBS="$CLEANLIBS"

    fi

    fi

    dnl USE_SSLEAY is the historical name for what configure calls

    dnl OPENSSL_ENABLED; the names should really be unified

    USE_SSLEAY="$OPENSSL_ENABLED"

    AC_SUBST(USE_SSLEAY)





    if test X"$OPT_SSL" != Xoff &&

    if test X"$OPT_SSL" != Xoff &&

       test "$OPENSSL_ENABLED" != "1"; then

       test "$OPENSSL_ENABLED" != "1"; then
@@ -1675,8 +1669,8 @@ dnl --- 
if test "$OPENSSL_ENABLED" = "1"; then

if test "$OPENSSL_ENABLED" = "1"; then

  AC_CHECK_LIB(crypto, SRP_Calc_client_key,

  AC_CHECK_LIB(crypto, SRP_Calc_client_key,

   [

   [

     AC_DEFINE(HAVE_SSLEAY_SRP, 1, [if you have the function SRP_Calc_client_key])

     AC_DEFINE(HAVE_OPENSSL_SRP, 1, [if you have the function SRP_Calc_client_key])

     AC_SUBST(HAVE_SSLEAY_SRP, [1])

     AC_SUBST(HAVE_OPENSSL_SRP, [1])

   ])

   ])

fi

fi
@@ -3271,7 +3265,7 @@ AC_HELP_STRING([--disable-tls-srp],[Disable TLS-SRP authentication]), 
       want_tls_srp=yes

       want_tls_srp=yes

)

)





if test "$want_tls_srp" = "yes" && ( test "x$HAVE_GNUTLS_SRP" = "x1" || test "x$HAVE_SSLEAY_SRP" = "x1") ; then

if test "$want_tls_srp" = "yes" && ( test "x$HAVE_GNUTLS_SRP" = "x1" || test "x$HAVE_OPENSSL_SRP" = "x1") ; then

   AC_DEFINE(USE_TLS_SRP, 1, [Use TLS-SRP authentication])

   AC_DEFINE(USE_TLS_SRP, 1, [Use TLS-SRP authentication])

   USE_TLS_SRP=1

   USE_TLS_SRP=1

   curl_tls_srp_msg="enabled"

   curl_tls_srp_msg="enabled"
@@ -3385,7 +3379,7 @@ dnl For keeping supported features and protocols also in pkg-config file 
dnl since it is more cross-compile friendly than curl-config

dnl since it is more cross-compile friendly than curl-config

dnl

dnl





if test "x$USE_SSLEAY" = "x1"; then

if test "x$USE_OPENSSL" = "x1"; then

  SUPPORT_FEATURES="$SUPPORT_FEATURES SSL"

  SUPPORT_FEATURES="$SUPPORT_FEATURES SSL"

elif test -n "$SSL_ENABLED"; then

elif test -n "$SSL_ENABLED"; then

  SUPPORT_FEATURES="$SUPPORT_FEATURES SSL"

  SUPPORT_FEATURES="$SUPPORT_FEATURES SSL"
@@ -3424,7 +3418,7 @@ if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" -a \ 
fi

fi





if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1"; then

if test "x$CURL_DISABLE_CRYPTO_AUTH" != "x1"; then

  if test "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \

  if test "x$USE_OPENSSL" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \

      -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \

      -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \

      -o "x$DARWINSSL_ENABLED" = "x1"; then

      -o "x$DARWINSSL_ENABLED" = "x1"; then

    SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM"

    SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM"
@@ -3497,7 +3491,7 @@ if test "x$CURL_DISABLE_IMAP" != "x1"; then 
fi

fi

if test "x$CURL_DISABLE_SMB" != "x1" \

if test "x$CURL_DISABLE_SMB" != "x1" \

    -a "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" \

    -a "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" \

    -a \( "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \

    -a \( "x$USE_OPENSSL" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \

      -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \

      -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \

      -o "x$DARWINSSL_ENABLED" = "x1" \); then

      -o "x$DARWINSSL_ENABLED" = "x1" \); then

  SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMB"

  SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMB"

lib/Makefile.b32

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ LINKLIB = $(LINKLIB) $(ZLIB_PATH)\zlib.lib 




# SSL support is enabled setting WITH_SSL=1

# SSL support is enabled setting WITH_SSL=1

!ifdef WITH_SSL

!ifdef WITH_SSL

DEFINES  = $(DEFINES) -DUSE_SSLEAY

DEFINES  = $(DEFINES) -DUSE_OPENSSL

INCDIRS  = $(INCDIRS);$(OPENSSL_PATH)\inc32;$(OPENSSL_PATH)\inc32\openssl

INCDIRS  = $(INCDIRS);$(OPENSSL_PATH)\inc32;$(OPENSSL_PATH)\inc32\openssl

LINKLIB  = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\libeay32.lib

LINKLIB  = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\libeay32.lib

!endif

!endif

lib/Makefile.m32

+2 −2
Original line number Original line Diff line number Diff line
@@ -215,13 +215,13 @@ ifdef SSL 
    endif

    endif

  endif

  endif

  INCLUDES += -I"$(OPENSSL_INCLUDE)"

  INCLUDES += -I"$(OPENSSL_INCLUDE)"

  CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \

  CFLAGS += -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \

            -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \

            -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \

            -DCURL_WANTS_CA_BUNDLE_ENV

            -DCURL_WANTS_CA_BUNDLE_ENV

  DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)

  DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)

  ifdef SRP

  ifdef SRP

    ifeq "$(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h)" "$(OPENSSL_INCLUDE)/openssl/srp.h"

    ifeq "$(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h)" "$(OPENSSL_INCLUDE)/openssl/srp.h"

      CFLAGS += -DHAVE_SSLEAY_SRP -DUSE_TLS_SRP

      CFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP

    endif

    endif

  endif

  endif

endif

endif

lib/Makefile.vc6

+1 −1
Original line number Original line Diff line number Diff line
@@ -105,7 +105,7 @@ WINDOWS_SDK_PATH = "$(PROGRAMFILES)\Microsoft SDK" 




CCNODBG      = cl.exe /O2 /DNDEBUG

CCNODBG      = cl.exe /O2 /DNDEBUG

CCDEBUG      = cl.exe /Od /Gm /Zi /D_DEBUG /GZ

CCDEBUG      = cl.exe /Od /Gm /Zi /D_DEBUG /GZ

CFLAGSSSL    = /DUSE_SSLEAY /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"

CFLAGSSSL    = /DUSE_OPENSSL /I "$(OPENSSL_PATH)/inc32" /I "$(OPENSSL_PATH)/inc32/openssl"

CFLAGSWINSSL = /DUSE_SCHANNEL

CFLAGSWINSSL = /DUSE_SCHANNEL

CFLAGSSSH2   = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"

CFLAGSSSH2   = /DUSE_LIBSSH2 /DCURL_DISABLE_LDAP /DHAVE_LIBSSH2 /DHAVE_LIBSSH2_H /DLIBSSH2_WIN32 /DLIBSSH2_LIBRARY /I "$(LIBSSH2_PATH)/include"

CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"

CFLAGSZLIB   = /DHAVE_ZLIB_H /DHAVE_ZLIB /DHAVE_LIBZ /I "$(ZLIB_PATH)"