From 83cfec7aacc4c15fb18680165ca60a6754681af1 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 6 Aug 2015 10:24:34 +0200 Subject: [PATCH] Make SecureTransport the default SSL backend on OS X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SecureTransport is now the default SSL backend on OS X. Users can still choose the OpenSSL backend by passing the -openssl, -openssl-linked or -no-securetransport option to configure script. [ChangeLog][Important Behavior Change] Make SecureTransport the default SSL backend on OS X Change-Id: I7a4edfdb72e63975d6b31435969702f8e86a10f2 Reviewed-by: Richard J. Moore Reviewed-by: Morten Johan Sørvig --- configure | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 9aac48e15c..472fb02dbc 100755 --- a/configure +++ b/configure @@ -2723,7 +2723,10 @@ MacOS/iOS options: link tools against those frameworks. -no-framework ...... Do not build Qt as a series of frameworks. - -securetransport ... Use SecureTransport instead of OpenSSL (requires -no-openssl) + * -securetransport ... Use SecureTransport instead of OpenSSL + + -no-securetransport Do not use SecureTransport, either use OpenSSL or dot not use any SSL backend + at all (if combined with -no-openssl). -sdk ......... Build Qt using Apple provided SDK . The argument should be one of the available SDKs as listed by 'xcodebuild -showsdks'. @@ -5932,6 +5935,13 @@ if compileTest unix/cloexec "cloexec"; then CFG_CLOEXEC=yes fi +if [ "$XPLATFORM_MAC" = "yes" ] && [ "$CFG_SECURETRANSPORT" != "no" ] && ([ "$CFG_OPENSSL" = "no" ] || [ "$CFG_OPENSSL" = "auto" ]); then + CFG_SECURETRANSPORT=yes + CFG_OPENSSL=no +else + CFG_SECURETRANSPORT=no +fi + # detect OpenSSL if [ "$CFG_OPENSSL" != "no" ]; then if compileTest unix/openssl "OpenSSL"; then @@ -5951,11 +5961,6 @@ if [ "$CFG_OPENSSL" != "no" ]; then fi fi -if [ "$CFG_SECURETRANSPORT" != "no" ] && [ "$CFG_OPENSSL" = "no" ] && [ "$XPLATFORM_MAC" = "yes" ]; then - CFG_SECURETRANSPORT=yes -else - CFG_SECURETRANSPORT=no -fi # detect PCRE if [ "$CFG_PCRE" != "qt" ]; then