Skip to content

Commit 70d204f

Browse files
authored
CDRIVER-3436 Document "ssl" APIs use TLS protocols (#1786)
* note only TLS protocols are supported
1 parent 7cbbf2c commit 70d204f

File tree

5 files changed

+25
-10
lines changed

5 files changed

+25
-10
lines changed

src/libmongoc/doc/conf.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,9 @@ def _maybe_update_inventories(app: Sphinx):
223223
224224
.. _bson_lifetimes: https://www.mongodb.com/docs/languages/c/c-driver/current/libbson/guides/lifetimes/
225225
226+
.. |ssl:naming| replace::
227+
Though some API names include the term "ssl", the C driver only support TLS protocols, which supersede SSL.
228+
226229
"""
227230

228231

src/libmongoc/doc/mongoc_client_pool_set_ssl_opts.rst

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,21 @@ Synopsis
1414
const mongoc_ssl_opt_t *opts);
1515
#endif
1616
17+
.. note::
18+
|ssl:naming|
19+
1720
This function is identical to :symbol:`mongoc_client_set_ssl_opts()` except for
1821
client pools. It ensures that all clients retrieved from
1922
:symbol:`mongoc_client_pool_pop()` or :symbol:`mongoc_client_pool_try_pop()`
20-
are configured with the same SSL settings.
23+
are configured with the same TLS settings.
2124

22-
The ``mongoc_ssl_opt_t`` struct is copied by the pool along with the strings
25+
The :symbol:`mongoc_ssl_opt_t` struct is copied by the pool along with the strings
2326
it points to (``pem_file``, ``pem_pwd``, ``ca_file``, ``ca_dir``, and
2427
``crl_file``) so they don't have to remain valid after the call to
25-
``mongoc_client_pool_set_ssl_opts``.
28+
:symbol:`mongoc_client_pool_set_ssl_opts`.
2629

27-
A call to ``mongoc_client_pool_set_ssl_opts`` overrides all TLS options set
28-
through the connection string with which the ``mongoc_client_pool_t`` was
30+
A call to :symbol:`mongoc_client_pool_set_ssl_opts` overrides all TLS options set
31+
through the connection string with which the :symbol:`mongoc_client_pool_t` was
2932
constructed.
3033

3134
Parameters

src/libmongoc/doc/mongoc_client_set_ssl_opts.rst

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,18 @@ Synopsis
1414
const mongoc_ssl_opt_t *opts);
1515
#endif
1616
17+
.. note::
18+
|ssl:naming|
19+
1720
Sets the TLS (SSL) options to use when connecting to TLS enabled MongoDB servers.
1821

19-
The ``mongoc_ssl_opt_t`` struct is copied by the client along with the strings
22+
The :symbol:`mongoc_ssl_opt_t` struct is copied by the client along with the strings
2023
it points to (``pem_file``, ``pem_pwd``, ``ca_file``, ``ca_dir``, and
2124
``crl_file``) so they don't have to remain valid after the call to
22-
``mongoc_client_set_ssl_opts``.
25+
:symbol:`mongoc_client_set_ssl_opts`.
2326

24-
A call to ``mongoc_client_set_ssl_opts`` overrides all TLS options set through
25-
the connection string with which the ``mongoc_client_t`` was constructed.
27+
A call to :symbol:`mongoc_client_set_ssl_opts` overrides all TLS options set through
28+
the connection string with which the :symbol:`mongoc_client_t` was constructed.
2629

2730
It is a programming error to call this function on a client from a
2831
:symbol:`mongoc_client_pool_t`. Instead, call

src/libmongoc/doc/mongoc_ssl_opt_get_default.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ Synopsis
1111
const mongoc_ssl_opt_t *
1212
mongoc_ssl_opt_get_default (void);
1313
14+
.. note::
15+
|ssl:naming|
16+
1417
Returns
1518
-------
1619

17-
Returns the default SSL options for the process. This should not be modified or freed.
20+
Returns the default TLS options for the process. This should not be modified or freed.
1821

src/libmongoc/doc/mongoc_ssl_opt_t.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ Synopsis
2020
void *padding[6];
2121
} mongoc_ssl_opt_t;
2222
23+
.. note::
24+
|ssl:naming|
25+
2326
Description
2427
-----------
2528

0 commit comments

Comments
 (0)