Skip to content

PHPC-1031: Run configure check to use ASN1_STRING_get0_data over ASN1_STRING_data in bundled libmongoc #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

derickr
Copy link
Contributor

@derickr derickr commented Nov 9, 2017

@derickr derickr requested a review from jmikola November 9, 2017 16:25
@@ -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>]])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming this is for OpenSSL 1.1, we might need a similar check in this part of config.w32. That could be done by checking if SETUP_OPENSSL() returns 2.

@derickr derickr merged commit a140e61 into mongodb:master Nov 13, 2017
derickr added a commit that referenced this pull request Nov 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants