generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BoringSSL: detected by configure, switches off NTLM

Browse Source
This commit is contained in:
Daniel Stenberg
2015-01-22 16:34:18 +01:00
parent d6c4695dcd
commit eb748f159a
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@@ -1579,7 +1579,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then
]) ])
dnl these can only exist if openssl exists dnl these can only exist if openssl exists
dnl yassl doesn't have SSL_get_shutdown dnl Cyassl doesn't have SSL_get_shutdown
dnl BoringSSL doesn't have DES_set_odd_parity
AC_CHECK_FUNCS( RAND_status \ AC_CHECK_FUNCS( RAND_status \
RAND_screen \ RAND_screen \
@@ -1587,7 +1588,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then
ENGINE_cleanup \ ENGINE_cleanup \
CRYPTO_cleanup_all_ex_data \ CRYPTO_cleanup_all_ex_data \
SSL_get_shutdown \ SSL_get_shutdown \
SSLv2_client_method ) SSLv2_client_method \
DES_set_odd_parity )
dnl Make an attempt to detect if this is actually yassl's headers and dnl Make an attempt to detect if this is actually yassl's headers and
dnl OpenSSL emulation layer. We still leave everything else believing dnl OpenSSL emulation layer. We still leave everything else believing
@@ -1612,6 +1614,13 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then
],[ ],[
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
]) ])
AC_MSG_CHECKING([for BoringSSL])
if test "x$ac_cv_func_des_set_odd_parity" != "xyes"; then
curl_ssl_msg="enabled (BoringSSL)"
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
fi fi
if test "$OPENSSL_ENABLED" = "1"; then if test "$OPENSSL_ENABLED" = "1"; then

7
lib/curl_setup.h
View File

@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@@ -625,9 +625,14 @@ int netware_init(void);
#if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI) || \ #if defined(USE_SSLEAY) || defined(USE_WINDOWS_SSPI) || \
defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_DARWINSSL) || \ defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_DARWINSSL) || \
defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO) defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO)
#if defined(USE_SSLEAY) && !defined(HAVE_DES_SET_ODD_PARITY)
/* BoringSSL, not NTLM capable */
#else
#define USE_NTLM #define USE_NTLM
#endif #endif
#endif #endif
#endif
/* non-configure builds may define CURL_WANTS_CA_BUNDLE_ENV */ /* non-configure builds may define CURL_WANTS_CA_BUNDLE_ENV */
#if defined(CURL_WANTS_CA_BUNDLE_ENV) && !defined(CURL_CA_BUNDLE) #if defined(CURL_WANTS_CA_BUNDLE_ENV) && !defined(CURL_CA_BUNDLE)