Merged pull request #668

Author: derickr

config.m4

@@ -295,6 +295,8 @@ if test "$MONGODB" != "no"; then
       AC_SUBST(MONGOC_ENABLE_SSL, 1)
       AC_SUBST(MONGOC_ENABLE_CRYPTO_LIBCRYPTO, 1)
       AC_SUBST(MONGOC_ENABLE_SSL_OPENSSL, 1)
+
+      AC_CHECK_DECLS([ASN1_STRING_get0_data], [AC_SUBST(MONGOC_HAVE_ASN1_STRING_GET0_DATA, 1)], [AC_SUBST(MONGOC_HAVE_ASN1_STRING_GET0_DATA, 1)], [[#include <openssl/asn1.h>]])
     ])
 
     if test "$PHP_SYSTEM_CIPHERS" != "no"; then

config.w32

@@ -170,7 +170,11 @@ if (PHP_MONGODB != "no") {
   /* PHP 7.1.2 introduced SETUP_OPENSSL(), which supports OpenSSL 1.1.x. Earlier
    * versions will use the legacy check for OpenSSL 1.0.x and lower. */
   if (typeof SETUP_OPENSSL === 'function') {
-    mongoc_ssl_found = SETUP_OPENSSL("mongodb", mongoc_ssl_path_to_check) > 0;
+    openssl_type = SETUP_OPENSSL("mongodb", mongoc_ssl_path_to_check);
+    mongoc_ssl_found = openssl_type > 0;
+    if (openssl_type >= 2) {
+      mongoc_opts.MONGOC_HAVE_ASN1_STRING_GET0_DATA = 1;
+    }
   } else if (CHECK_LIB("ssleay32.lib", "mongodb", mongoc_ssl_path_to_check) &&
              CHECK_LIB("libeay32.lib", "mongodb", mongoc_ssl_path_to_check) &&
              CHECK_LIB("crypt32.lib", "mongodb", mongoc_ssl_path_to_check) &&