Merge pull request #326

Author: jmikola

config.m4

@@ -3,8 +3,8 @@ PHP_ARG_ENABLE(mongodb, whether to enable mongodb support,
 [  --enable-mongodb           Enable mongodb support])
 PHP_ARG_WITH(openssl-dir, OpenSSL dir for mongodb,
 [  --with-openssl-dir[=DIR]  openssl install prefix], yes, no)
-
-
+PHP_ARG_WITH(system-ciphers, whether to use system default cipher list instead of hardcoded value,
+[  --with-system-ciphers   OPENSSL: Use system default cipher list instead of hardcoded value], no, no)
 
 dnl borrowed from PHP acinclude.m4
 AC_DEFUN([PHP_BSON_BIGENDIAN],
@@ -394,15 +394,21 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
     PHP_SETUP_OPENSSL(MONGODB_SHARED_LIBADD)
     AC_SUBST(MONGOC_ENABLE_CRYPTO, 1)
     AC_SUBST(MONGOC_ENABLE_SSL, 1)
-    AC_SUBST(MONGOC_ENABLE_LIBCRYPTO, 1)
-    AC_SUBST(MONGOC_ENABLE_OPENSSL, 1)
+    AC_SUBST(MONGOC_ENABLE_CRYPTO_LIBCRYPTO, 1)
+    AC_SUBST(MONGOC_ENABLE_SSL_OPENSSL, 1)
+
+    if test "$PHP_SYSTEM_CIPHERS" != "no"; then
+      AC_SUBST(MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE, 1)
+    else
+      AC_SUBST(MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE, 0)
+    fi
 
     dnl TODO: Support building with Secure Transport on OSX
-    AC_SUBST(MONGOC_ENABLE_SECURE_TRANSPORT, 0)
-    AC_SUBST(MONGOC_ENABLE_COMMON_CRYPTO, 0)
+    AC_SUBST(MONGOC_ENABLE_SSL_SECURE_TRANSPORT, 0)
+    AC_SUBST(MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO, 0)
 
     dnl Secure Channel only applies to Windows
-    AC_SUBST(MONGOC_ENABLE_SECURE_CHANNEL, 0)
+    AC_SUBST(MONGOC_ENABLE_SSL_SECURE_CHANNEL, 0)
     AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0)
 
     AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)

config.w32

@@ -40,24 +40,26 @@ if (PHP_MONGODB != "no") {
   if (CHECK_LIB("ssleay32.lib", "mongodb", PHP_MONGODB) &&
       CHECK_LIB("libeay32.lib", "mongodb", PHP_MONGODB) &&
       CHECK_HEADER_ADD_INCLUDE("openssl/ssl.h", "CFLAGS_MONGOC")) {
-    AC_DEFINE("MONGOC_ENABLE_OPENSSL", 1);
-    AC_DEFINE("MONGOC_ENABLE_LIBCRYPTO", 1);
+    AC_DEFINE("MONGOC_ENABLE_SSL_OPENSSL", 1);
+    AC_DEFINE("MONGOC_ENABLE_CRYPTO_LIBCRYPTO", 1);
     AC_DEFINE("MONGOC_ENABLE_SSL", 1);
     AC_DEFINE("MONGOC_ENABLE_CRYPTO", 1);
+    AC_DEFINE("MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE", 1);
   } else {
     WARNING("mongodb libopenssl support not enabled, libs not found");
-    AC_DEFINE("MONGOC_ENABLE_OPENSSL", 0);
-    AC_DEFINE("MONGOC_ENABLE_LIBCRYPTO", 0);
+    AC_DEFINE("MONGOC_ENABLE_SSL_OPENSSL", 0);
+    AC_DEFINE("MONGOC_ENABLE_CRYPTO_LIBCRYPTO", 0);
     AC_DEFINE("MONGOC_ENABLE_SSL", 0);
     AC_DEFINE("MONGOC_ENABLE_CRYPTO", 0);
+    AC_DEFINE("MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE", 0);
   }
 
   // Secure Transport does not apply to Windows
-  AC_DEFINE("MONGOC_ENABLE_SECURE_TRANSPORT", 0);
-  AC_DEFINE("MONGOC_ENABLE_COMMON_CRYPTO", 0);
+  AC_DEFINE("MONGOC_ENABLE_SSL_SECURE_TRANSPORT", 0);
+  AC_DEFINE("MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO", 0);
 
   // TODO: Support building with Secure Channel on Windows
-  AC_DEFINE("MONGOC_ENABLE_SECURE_CHANNEL", 0)
+  AC_DEFINE("MONGOC_ENABLE_SSL_SECURE_CHANNEL", 0)
   AC_DEFINE("MONGOC_ENABLE_CRYPTO_CNG", 0)
 
   if (PHP_MONGODB_SASL != "no" &&