Skip to content

W
wine-cw
Commit f91909b3 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

configure: Make the libssl soname check depend on the header check.

parent ccd5f284
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 177 deletions
configure
View file @ f91909b3
...@@ -13828,6 +13828,166 @@ fi ...@@ -13828,6 +13828,166 @@ fi
fi fi
if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes"
then
{ echo "$as_me:$LINENO: checking for -lssl" >&5
echo $ECHO_N "checking for -lssl... $ECHO_C" >&6; }
if test "${ac_cv_lib_soname_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_soname_save_LIBS=$LIBS
LIBS="-lssl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char SSL_library_init ();
int
main ()
{
return SSL_library_init ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
case "$LIBEXT" in
dll) ;;
dylib) ac_cv_lib_soname_ssl=`otool -L conftest$ac_exeext | grep "libssl\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libssl\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
*) ac_cv_lib_soname_ssl=`$ac_cv_path_LDD conftest$ac_exeext | grep "libssl\\.$LIBEXT" | sed -e "s/^.*\(libssl\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
esac
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_soname_save_LIBS
fi
if test "x$ac_cv_lib_soname_ssl" = "x"; then
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
else
{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ssl" >&5
echo "${ECHO_T}$ac_cv_lib_soname_ssl" >&6; }
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBSSL "$ac_cv_lib_soname_ssl"
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for -lcrypto" >&5
echo $ECHO_N "checking for -lcrypto... $ECHO_C" >&6; }
if test "${ac_cv_lib_soname_crypto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_soname_save_LIBS=$LIBS
LIBS="-lcrypto $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char BIO_new_socket ();
int
main ()
{
return BIO_new_socket ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
case "$LIBEXT" in
dll) ;;
dylib) ac_cv_lib_soname_crypto=`otool -L conftest$ac_exeext | grep "libcrypto\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcrypto\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
*) ac_cv_lib_soname_crypto=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcrypto\\.$LIBEXT" | sed -e "s/^.*\(libcrypto\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
esac
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_soname_save_LIBS
fi
if test "x$ac_cv_lib_soname_crypto" = "x"; then
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
else
{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_crypto" >&5
echo "${ECHO_T}$ac_cv_lib_soname_crypto" >&6; }
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBCRYPTO "$ac_cv_lib_soname_crypto"
_ACEOF
fi
fi
EXTRACFLAGS="" EXTRACFLAGS=""
...@@ -15318,162 +15478,6 @@ _ACEOF ...@@ -15318,162 +15478,6 @@ _ACEOF
fi fi
{ echo "$as_me:$LINENO: checking for -lssl" >&5
echo $ECHO_N "checking for -lssl... $ECHO_C" >&6; }
if test "${ac_cv_lib_soname_ssl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_soname_save_LIBS=$LIBS
LIBS="-lssl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char SSL_library_init ();
int
main ()
{
return SSL_library_init ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
case "$LIBEXT" in
dll) ;;
dylib) ac_cv_lib_soname_ssl=`otool -L conftest$ac_exeext | grep "libssl\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libssl\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
*) ac_cv_lib_soname_ssl=`$ac_cv_path_LDD conftest$ac_exeext | grep "libssl\\.$LIBEXT" | sed -e "s/^.*\(libssl\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
esac
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_soname_save_LIBS
fi
if test "x$ac_cv_lib_soname_ssl" = "x"; then
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
else
{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_ssl" >&5
echo "${ECHO_T}$ac_cv_lib_soname_ssl" >&6; }
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBSSL "$ac_cv_lib_soname_ssl"
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for -lcrypto" >&5
echo $ECHO_N "checking for -lcrypto... $ECHO_C" >&6; }
if test "${ac_cv_lib_soname_crypto+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_soname_save_LIBS=$LIBS
LIBS="-lcrypto $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char BIO_new_socket ();
int
main ()
{
return BIO_new_socket ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
case "$LIBEXT" in
dll) ;;
dylib) ac_cv_lib_soname_crypto=`otool -L conftest$ac_exeext | grep "libcrypto\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcrypto\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
*) ac_cv_lib_soname_crypto=`$ac_cv_path_LDD conftest$ac_exeext | grep "libcrypto\\.$LIBEXT" | sed -e "s/^.*\(libcrypto\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;;
esac
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_soname_save_LIBS
fi
if test "x$ac_cv_lib_soname_crypto" = "x"; then
{ echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; }
else
{ echo "$as_me:$LINENO: result: $ac_cv_lib_soname_crypto" >&5
echo "${ECHO_T}$ac_cv_lib_soname_crypto" >&6; }
cat >>confdefs.h <<_ACEOF
#define SONAME_LIBCRYPTO "$ac_cv_lib_soname_crypto"
_ACEOF
fi
{ echo "$as_me:$LINENO: checking for -ljpeg" >&5 { echo "$as_me:$LINENO: checking for -ljpeg" >&5
echo $ECHO_N "checking for -ljpeg... $ECHO_C" >&6; } echo $ECHO_N "checking for -ljpeg... $ECHO_C" >&6; }
if test "${ac_cv_lib_soname_jpeg+set}" = set; then if test "${ac_cv_lib_soname_jpeg+set}" = set; then
......
configure.ac
View file @ f91909b3
...@@ -985,6 +985,13 @@ then ...@@ -985,6 +985,13 @@ then
WINE_CHECK_SONAME(fontconfig,FcInit) WINE_CHECK_SONAME(fontconfig,FcInit)
fi fi
dnl **** Check for SSL ****
if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes"
then
WINE_CHECK_SONAME(ssl,SSL_library_init)
WINE_CHECK_SONAME(crypto,BIO_new_socket)
fi
dnl **** Check for gcc specific options **** dnl **** Check for gcc specific options ****
AC_SUBST(EXTRACFLAGS,"") AC_SUBST(EXTRACFLAGS,"")
...@@ -1133,8 +1140,6 @@ WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS] ...@@ -1133,8 +1140,6 @@ WINE_CHECK_SONAME(Xcursor,XcursorImageLoadCursor,,,[$X_LIBS -lX11 $X_EXTRA_LIBS]
WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS]) WINE_CHECK_SONAME(freetype,FT_Init_FreeType,,,[$X_LIBS])
WINE_CHECK_SONAME(GL,glXQueryExtension,,,[$X_LIBS $X_EXTRA_LIBS]) WINE_CHECK_SONAME(GL,glXQueryExtension,,,[$X_LIBS $X_EXTRA_LIBS])
WINE_CHECK_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1) WINE_CHECK_SONAME(txc_dxtn,fetch_2d_texel_rgba_dxt1)
WINE_CHECK_SONAME(ssl,SSL_library_init)
WINE_CHECK_SONAME(crypto,BIO_new_socket)
WINE_CHECK_SONAME(jpeg,jpeg_start_decompress) WINE_CHECK_SONAME(jpeg,jpeg_start_decompress)
......
dlls/wininet/netconnection.c
View file @ f91909b3
...@@ -68,17 +68,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); ...@@ -68,17 +68,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet);
* SSL stuff should use crypt32.dll * SSL stuff should use crypt32.dll
*/ */
#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H #ifdef SONAME_LIBSSL
#include <openssl/err.h> #include <openssl/err.h>
#ifndef SONAME_LIBSSL
#define SONAME_LIBSSL "libssl" SONAME_EXT
#endif
#ifndef SONAME_LIBCRYPTO
#define SONAME_LIBCRYPTO "libcrypto" SONAME_EXT
#endif
static void *OpenSSL_ssl_handle; static void *OpenSSL_ssl_handle;
static void *OpenSSL_crypto_handle; static void *OpenSSL_crypto_handle;
...@@ -120,7 +113,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) ...@@ -120,7 +113,7 @@ BOOL NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL)
connection->socketFD = -1; connection->socketFD = -1;
if (useSSL) if (useSSL)
{ {
#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H #ifdef SONAME_LIBSSL
TRACE("using SSL connection\n"); TRACE("using SSL connection\n");
if (OpenSSL_ssl_handle) /* already initialized everything */ if (OpenSSL_ssl_handle) /* already initialized everything */
return TRUE; return TRUE;
...@@ -278,7 +271,7 @@ static int sock_get_error( int err ) ...@@ -278,7 +271,7 @@ static int sock_get_error( int err )
BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain, BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain,
int type, int protocol) int type, int protocol)
{ {
#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H #ifdef SONAME_LIBSSL
if (connection->useSSL) if (connection->useSSL)
return FALSE; return FALSE;
#endif #endif
...@@ -302,7 +295,7 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection) ...@@ -302,7 +295,7 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection)
if (!NETCON_connected(connection)) return FALSE; if (!NETCON_connected(connection)) return FALSE;
#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H #ifdef SONAME_LIBSSL
if (connection->useSSL) if (connection->useSSL)
{ {
HeapFree(GetProcessHeap(),0,connection->peek_msg_mem); HeapFree(GetProcessHeap(),0,connection->peek_msg_mem);
...@@ -328,7 +321,7 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection) ...@@ -328,7 +321,7 @@ BOOL NETCON_close(WININET_NETCONNECTION *connection)
} }
return TRUE; return TRUE;
} }
#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H #ifdef SONAME_LIBSSL
static BOOL check_hostname(X509 *cert, char *hostname) static BOOL check_hostname(X509 *cert, char *hostname)
{ {
/* FIXME: implement */ /* FIXME: implement */
...@@ -341,7 +334,7 @@ static BOOL check_hostname(X509 *cert, char *hostname) ...@@ -341,7 +334,7 @@ static BOOL check_hostname(X509 *cert, char *hostname)
*/ */
BOOL NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname) BOOL NETCON_secure_connect(WININET_NETCONNECTION *connection, LPCWSTR hostname)
{ {
#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H #ifdef SONAME_LIBSSL
long verify_res; long verify_res;
X509 *cert; X509 *cert;
int len; int len;
...@@ -479,7 +472,7 @@ BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len, ...@@ -479,7 +472,7 @@ BOOL NETCON_send(WININET_NETCONNECTION *connection, const void *msg, size_t len,
} }
else else
{ {
#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H #ifdef SONAME_LIBSSL
if (flags) if (flags)
FIXME("SSL_write doesn't support any flags (%08x)\n", flags); FIXME("SSL_write doesn't support any flags (%08x)\n", flags);
*sent = pSSL_write(connection->ssl_s, msg, len); *sent = pSSL_write(connection->ssl_s, msg, len);
...@@ -516,7 +509,7 @@ BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int f ...@@ -516,7 +509,7 @@ BOOL NETCON_recv(WININET_NETCONNECTION *connection, void *buf, size_t len, int f
} }
else else
{ {
#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H #ifdef SONAME_LIBSSL
if (flags & ~(MSG_PEEK|MSG_WAITALL)) if (flags & ~(MSG_PEEK|MSG_WAITALL))
FIXME("SSL_read does not support the following flag: %08x\n", flags); FIXME("SSL_read does not support the following flag: %08x\n", flags);
...@@ -583,7 +576,7 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *avail ...@@ -583,7 +576,7 @@ BOOL NETCON_query_data_available(WININET_NETCONNECTION *connection, DWORD *avail
return FALSE; return FALSE;
*available = 0; *available = 0;
#if defined HAVE_OPENSSL_SSL_H #ifdef SONAME_LIBSSL
if (connection->peek_msg) *available = connection->peek_len; if (connection->peek_msg) *available = connection->peek_len;
#endif #endif
...@@ -664,7 +657,7 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD ...@@ -664,7 +657,7 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD
} }
else else
{ {
#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H #ifdef SONAME_LIBSSL
long prev_timeout; long prev_timeout;
DWORD nRecv = 0; DWORD nRecv = 0;
BOOL success = TRUE; BOOL success = TRUE;
...@@ -708,8 +701,7 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD ...@@ -708,8 +701,7 @@ BOOL NETCON_getNextLine(WININET_NETCONNECTION *connection, LPSTR lpszBuffer, LPD
LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection) LPCVOID NETCON_GetCert(WININET_NETCONNECTION *connection)
{ {
#ifdef SONAME_LIBSSL
#if defined HAVE_OPENSSL_SSL_H && defined HAVE_OPENSSL_ERR_H
X509* cert; X509* cert;
unsigned char* buffer,*p; unsigned char* buffer,*p;
INT len; INT len;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment