Merge pull request #295

Author: jmikola

config.m4

@@ -287,27 +287,28 @@ if test "$MONGODB" != "no"; then
     mongoc-ssl.c
   ";
 
-  MONGOC_SOURCES_LIBCRYPTO="\
-    mongoc-crypto-openssl.c \
-    mongoc-rand-openssl.c
-  ";
-
   MONGOC_SOURCES_OPENSSL="\
+    mongoc-crypto-openssl.c \
     mongoc-openssl.c \
+    mongoc-rand-openssl.c \
     mongoc-stream-tls-openssl.c \
     mongoc-stream-tls-openssl-bio.c
   ";
 
-  MONGOC_SOURCES_COMMON_CRYPTO="\
-    mongoc-crypto-common-crypto.c \
-    mongoc-rand-common-crypto.c
-  ";
-
   MONGOC_SOURCES_SECURE_TRANSPORT="\
+    mongoc-crypto-common-crypto.c \
+    mongoc-rand-common-crypto.c \
     mongoc-secure-transport.c \
     mongoc-stream-tls-secure-transport.c
   ";
 
+  MONGOC_SOURCES_SECURE_CHANNEL="\
+    mongoc-crypto-cng.c \
+    mongoc-rand-cng.c \
+    mongoc-secure-channel.c \
+    mongoc-stream-tls-secure-channel.c
+  ";
+
   MONGOC_SOURCES_SASL=mongoc-sasl.c
 
   if test "$ext_shared" = "no"; then
@@ -385,10 +386,9 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
     PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES,                  [$STD_CFLAGS], shared_objects_mongodb, yes)
     PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_CRYPTO,           [$STD_CFLAGS], shared_objects_mongodb, yes)
     PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SSL,              [$STD_CFLAGS], shared_objects_mongodb, yes)
-    PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_LIBCRYPTO,        [$STD_CFLAGS], shared_objects_mongodb, yes)
     PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_OPENSSL,          [$STD_CFLAGS], shared_objects_mongodb, yes)
-    PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_COMMON_CRYPTO,    [$STD_CFLAGS], shared_objects_mongodb, yes)
     PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SECURE_TRANSPORT, [$STD_CFLAGS], shared_objects_mongodb, yes)
+    PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SECURE_CHANNEL,   [$STD_CFLAGS], shared_objects_mongodb, yes)
     PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SASL,             [$STD_CFLAGS], shared_objects_mongodb, yes)
 
 
@@ -402,6 +402,10 @@ PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
     AC_SUBST(MONGOC_ENABLE_SECURE_TRANSPORT, 0)
     AC_SUBST(MONGOC_ENABLE_COMMON_CRYPTO, 0)
 
+    dnl Secure Channel only applies to Windows
+    AC_SUBST(MONGOC_ENABLE_SECURE_CHANNEL, 0)
+    AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0)
+
     AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)
   fi
 

config.w32

@@ -23,6 +23,8 @@ if (PHP_MONGODB != "no") {
   ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-openssl.c mongoc-stream-tls-openssl.c mongoc-stream-tls-openssl-bio.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-crypto-common-crypto.c mongoc-rand-common-crypto.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-secure-transport.c mongoc-stream-tls-secure-transport.c", "mongodb");
+  ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-crypto-cng.c mongoc-rand-cng.c", "mongodb");
+  ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-secure-channel.c mongoc-stream-tls-secure-channel.c", "mongodb");
   ADD_SOURCES(configure_module_dirname + "/src/libmongoc/src/mongoc", "mongoc-sasl.c", "mongodb");
 
   AC_DEFINE("HAVE_MONGOC", 1);
@@ -54,6 +56,10 @@ if (PHP_MONGODB != "no") {
   AC_DEFINE("MONGOC_ENABLE_SECURE_TRANSPORT", 0);
   AC_DEFINE("MONGOC_ENABLE_COMMON_CRYPTO", 0);
 
+  // TODO: Support building with Secure Channel on Windows
+  AC_DEFINE("MONGOC_ENABLE_SECURE_CHANNEL", 0)
+  AC_DEFINE("MONGOC_ENABLE_CRYPTO_CNG", 0)
+
   if (PHP_MONGODB_SASL != "no" &&
       CHECK_LIB("libsasl.lib", "mongodb", PHP_MONGODB) &&
       CHECK_HEADER_ADD_INCLUDE("sasl/sasl.h", "CFLAGS_MONGOC")) {

php_phongo.c

@@ -1989,6 +1989,7 @@ bool phongo_manager_init(php_phongo_manager_t *manager, const char *uri_string,
 	    !php_phongo_apply_rp_options_to_uri(uri, bson_options TSRMLS_CC) ||
 	    !php_phongo_apply_wc_options_to_uri(uri, bson_options TSRMLS_CC)) {
 		/* Exception should already have been thrown */
+		mongoc_uri_destroy(uri);
 		return false;
 	}