release v3.2.1 (#1299)

* Fix compilation when `dns-resolver` is disabled (#1292)

* RUST-2144 Remove use of deprecated `openssl_probe` method (#1294)

* RUST-2144 Use recommended openssl probing API (#1297)

* RUST-2143 Test compiling with no default features enabled (#1296)

* release v3.2.1

---------

Co-authored-by: Abraham Egnor <abraham.egnor@mongodb.com>

Author: isabelatkinson

.evergreen/compile-only.sh

@@ -17,3 +17,6 @@ cargo $TOOLCHAIN build
 
 # Test with all features.
 cargo $TOOLCHAIN build --all-features
+
+# Test with no default features.
+cargo $TOOLCHAIN build --no-default-features --features compat-3-0-0,rustls-tls

Cargo.toml

@@ -16,7 +16,7 @@ homepage = "https://www.mongodb.com/docs/drivers/rust/"
 license = "Apache-2.0"
 readme = "README.md"
 name = "mongodb"
-version = "3.2.0"
+version = "3.2.1"
 
 exclude = [
     "etc/**",
@@ -92,7 +92,7 @@ once_cell = "1.19.0"
 log = { version = "0.4.17", optional = true }
 md-5 = "0.10.1"
 mongocrypt = { git = "https://github.com/mongodb/libmongocrypt-rust.git", branch = "main", optional = true, version = "0.2.1" }
-mongodb-internal-macros = { path = "macros", version = "3.2.0" }
+mongodb-internal-macros = { path = "macros", version = "3.2.1" }
 num_cpus = { version = "1.13.1", optional = true }
 openssl = { version = "0.10.38", optional = true }
 openssl-probe = { version = "0.1.5", optional = true }

README.md

@@ -18,7 +18,7 @@ The driver tests against Linux, MacOS, and Windows in CI.
 The driver is available on [crates.io](https://crates.io/crates/mongodb). To use the driver in your application, simply add it to your project's `Cargo.toml`.
 ```toml
 [dependencies]
-mongodb = "3.2.0"
+mongodb = "3.2.1"
 ```
 
 Version 1 of this crate has reached end of life and will no longer be receiving any updates or bug fixes, so all users are recommended to always depend on the latest 2.x release. See the [2.0.0 release notes](https://github.com/mongodb/mongo-rust-driver/releases/tag/v2.0.0) for migration information if upgrading from a 1.x version.
@@ -27,7 +27,7 @@ Version 1 of this crate has reached end of life and will no longer be receiving
 The driver also provides a blocking sync API. To enable this, add the `"sync"` feature to your `Cargo.toml`:
 ```toml
 [dependencies.mongodb]
-version = "3.2.0"
+version = "3.2.1"
 features = ["sync"]
 ```
 **Note:** The sync-specific types can be imported from `mongodb::sync` (e.g. `mongodb::sync::Client`).

macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mongodb-internal-macros"
-version = "3.2.0"
+version = "3.2.1"
 description = "Internal macros for the mongodb crate"
 edition = "2021"
 license = "Apache-2.0"

src/lib.rs

@@ -12,7 +12,7 @@
 )]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![cfg_attr(test, type_length_limit = "80000000")]
-#![doc(html_root_url = "https://docs.rs/mongodb/3.2.0")]
+#![doc(html_root_url = "https://docs.rs/mongodb/3.2.1")]
 
 #[macro_use]
 pub mod options;

src/runtime/tls_openssl.rs

@@ -1,4 +1,4 @@
-use std::{pin::Pin, sync::Once};
+use std::pin::Pin;
 
 use openssl::{
     error::ErrorStack,
@@ -45,8 +45,6 @@ pub(super) async fn tls_connect(
     tcp_stream: TcpStream,
     cfg: &TlsConfig,
 ) -> Result<TlsStream> {
-    init_trust();
-
     let mut stream = make_ssl_stream(host, tcp_stream, cfg).map_err(|err| {
         Error::from(ErrorKind::InvalidTlsConfig {
             message: err.to_string(),
@@ -71,6 +69,11 @@ fn make_openssl_connector(cfg: TlsOptions) -> Result<SslConnector> {
 
     let mut builder = SslConnector::builder(SslMethod::tls_client()).map_err(openssl_err)?;
 
+    let probe = openssl_probe::probe();
+    builder
+        .load_verify_locations(probe.cert_file.as_deref(), probe.cert_dir.as_deref())
+        .map_err(openssl_err)?;
+
     let TlsOptions {
         allow_invalid_certificates,
         ca_file_path,
@@ -111,11 +114,6 @@ fn make_openssl_connector(cfg: TlsOptions) -> Result<SslConnector> {
     Ok(builder.build())
 }
 
-fn init_trust() {
-    static ONCE: Once = Once::new();
-    ONCE.call_once(openssl_probe::init_ssl_cert_env_vars);
-}
-
 fn make_ssl_stream(
     host: &str,
     tcp_stream: TcpStream,

src/srv.rs

@@ -20,6 +20,7 @@ pub(crate) struct LookupHosts {
 }
 
 impl LookupHosts {
+    #[cfg(feature = "dns-resolver")]
     pub(crate) fn validate(mut self, original_hostname: &str, dm: DomainMismatch) -> Result<Self> {
         let original_hostname_parts: Vec<_> = original_hostname.split('.').collect();
         let original_domain_name = if original_hostname_parts.len() >= 3 {
@@ -261,7 +262,10 @@ pub(crate) struct SrvResolver {}
 
 #[cfg(not(feature = "dns-resolver"))]
 impl SrvResolver {
-    pub(crate) async fn new(_config: Option<ResolverConfig>) -> Result<Self> {
+    pub(crate) async fn new(
+        _config: Option<ResolverConfig>,
+        _srv_service_name: Option<String>,
+    ) -> Result<Self> {
         Ok(Self {})
     }