Skip to content

CDRIVER-4297 use static decls for OpenSSL 1.1 polyfills #946

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.

Sign up for GitHub

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
merged 1 commit into from
Feb 16, 2022
Merged

CDRIVER-4297 use static decls for OpenSSL 1.1 polyfills #946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libmongoc/src/mongoc/mongoc-crypto-openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ mongoc_crypto_openssl_hmac_sha1 (mongoc_crypto_t *crypto,
}

#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
EVP_MD_CTX *
static EVP_MD_CTX *
Copy link
Member

Choose a reason for hiding this comment

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

@remicollet: Can you add static declarations to the polyfills in https://github.com/mongodb/mongo-c-driver/blob/1.21.0/src/kms-message/src/kms_crypto_libcrypto.c#L25 as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jmikola hmm... it is already there ? or I'm blind ?

Copy link
Member

Choose a reason for hiding this comment

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

You're absolutely right. My mistake!

EVP_MD_CTX_new (void)
{
return bson_malloc0 (sizeof (EVP_MD_CTX));
}

void
static void
EVP_MD_CTX_free (EVP_MD_CTX *ctx)
{
EVP_MD_CTX_cleanup (ctx);
Expand Down