$OpenBSD$ Index: src/mongo/util/net/ssl_manager.cpp --- src/mongo/util/net/ssl_manager.cpp.orig +++ src/mongo/util/net/ssl_manager.cpp @@ -269,18 +269,6 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ASN1_SEQUE #endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS // clang-format on -#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ - (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL) -// Copies of OpenSSL after 1.1.0 define new functions for interaction with -// X509 structure. We must polyfill used definitions to interact with older -// OpenSSL versions. -const STACK_OF(X509_EXTENSION) * X509_get0_extensions(const X509* peerCert) { - return peerCert->cert_info->extensions; -} -inline int X509_NAME_ENTRY_set(const X509_NAME_ENTRY* ne) { - return ne->set; -} - // On OpenSSL < 1.1.0, this chain isn't attached to // the SSL session, so we need it to dispose of itself. struct VerifiedChainDeleter { @@ -316,13 +304,6 @@ STACK_OF(X509) * SSL_get0_verified_chain(SSL* s) { return X509_STORE_CTX_get1_chain(ctx.get()); } - -#else -// No-op deleter for OpenSSL >= 1.1.0 -struct VerifiedChainDeleter { - void operator()(STACK_OF(X509) * chain) {} -}; -#endif using UniqueVerifiedChainPolyfill = std::unique_ptr; UniqueVerifiedChainPolyfill SSLgetVerifiedChain(SSL* s) {