Commit eb748f15 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

BoringSSL: detected by configure, switches off NTLM

parent d6c4695d

configure.ac

+11 −2
Original line number Diff line number Diff line
@@ -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 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 \

                    RAND_screen \
@@ -1587,7 +1588,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then 
                    ENGINE_cleanup \

                    CRYPTO_cleanup_all_ex_data \

                    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 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_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



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

lib/curl_setup.h

+6 −1
Original line number Diff line number Diff line
@@ -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

 * 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) || \

    defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_DARWINSSL) || \

    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

#endif

#endif

#endif



/* non-configure builds may define CURL_WANTS_CA_BUNDLE_ENV */

#if defined(CURL_WANTS_CA_BUNDLE_ENV) && !defined(CURL_CA_BUNDLE)