diff --git a/NEWS b/NEWS index b2fc6b287f..e1f8e0f895 100644 --- a/NEWS +++ b/NEWS @@ -100,6 +100,10 @@ Unreleased (2.0.0) * Deprecated GridFS API has been removed: * `mongoc_gridfs_find` is removed. Use `mongoc_gridfs_find_with_opts` instead. * `mongoc_gridfs_find_one` is removed. Use `mongoc_gridfs_find_one_with_opts` instead. +* Deprecated TLS stream API is removed: + * `mongoc_stream_tls_do_handshake` is removed. Use `mongoc_stream_tls_handshake` instead. + * `mongoc_stream_tls_check_cert` is removed. Use `mongoc_stream_tls_handshake` instead. + * `mongoc_stream_tls_new` is removed. Use `mongoc_stream_tls_new_with_hostname` instead. ### Forwarding headers (`#include ` and `#include `) diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls.c b/src/libmongoc/src/mongoc/mongoc-stream-tls.c index 780a14db5b..2e28061ed4 100644 --- a/src/libmongoc/src/mongoc/mongoc-stream-tls.c +++ b/src/libmongoc/src/mongoc/mongoc-stream-tls.c @@ -120,42 +120,6 @@ mongoc_stream_tls_handshake_block (mongoc_stream_t *stream, const char *host, in } return false; } -/** - * Deprecated. Was never supposed to be part of the public API. - * See mongoc_stream_tls_handshake. - */ -bool -mongoc_stream_tls_do_handshake (mongoc_stream_t *stream, int32_t timeout_msec) -{ - mongoc_stream_tls_t *stream_tls = (mongoc_stream_tls_t *) mongoc_stream_get_tls_stream (stream); - - BSON_UNUSED (timeout_msec); - - BSON_ASSERT (stream_tls); - - MONGOC_ERROR ("This function doesn't do anything. Please call " - "mongoc_stream_tls_handshake()"); - return false; -} - - -/** - * Deprecated. Was never supposed to be part of the public API. - * See mongoc_stream_tls_handshake. - */ -bool -mongoc_stream_tls_check_cert (mongoc_stream_t *stream, const char *host) -{ - mongoc_stream_tls_t *stream_tls = (mongoc_stream_tls_t *) mongoc_stream_get_tls_stream (stream); - - BSON_UNUSED (host); - - BSON_ASSERT (stream_tls); - - MONGOC_ERROR ("This function doesn't do anything. Please call " - "mongoc_stream_tls_handshake()"); - return false; -} /* @@ -263,10 +227,4 @@ mongoc_stream_tls_new_with_hostname_and_openssl_context ( } #endif -mongoc_stream_t * -mongoc_stream_tls_new (mongoc_stream_t *base_stream, mongoc_ssl_opt_t *opt, int client) -{ - return mongoc_stream_tls_new_with_hostname (base_stream, NULL, opt, client); -} - #endif diff --git a/src/libmongoc/src/mongoc/mongoc-stream-tls.h b/src/libmongoc/src/mongoc/mongoc-stream-tls.h index 6d0536c1d5..f5875c7669 100644 --- a/src/libmongoc/src/mongoc/mongoc-stream-tls.h +++ b/src/libmongoc/src/mongoc/mongoc-stream-tls.h @@ -40,20 +40,10 @@ mongoc_stream_tls_handshake_block (mongoc_stream_t *stream, int32_t timeout_msec, bson_error_t *error); -BSON_DEPRECATED_FOR (mongoc_stream_tls_handshake) -MONGOC_EXPORT (bool) mongoc_stream_tls_do_handshake (mongoc_stream_t *stream, int32_t timeout_msec); - -BSON_DEPRECATED_FOR (mongoc_stream_tls_handshake) -MONGOC_EXPORT (bool) mongoc_stream_tls_check_cert (mongoc_stream_t *stream, const char *host); - MONGOC_EXPORT (mongoc_stream_t *) mongoc_stream_tls_new_with_hostname (mongoc_stream_t *base_stream, const char *host, mongoc_ssl_opt_t *opt, int client) BSON_GNUC_WARN_UNUSED_RESULT; -BSON_DEPRECATED_FOR (mongoc_stream_tls_new_with_hostname) -MONGOC_EXPORT (mongoc_stream_t *) - mongoc_stream_tls_new (mongoc_stream_t *base_stream, mongoc_ssl_opt_t *opt, int client) BSON_GNUC_WARN_UNUSED_RESULT; - BSON_END_DECLS