tlsctx_client_session_cache_new() -> tlsctx_client_session_create()

Additionally to renaming, it changes the function definition so that
it accepts a pointer to pointer instead of returning a pointer to the
new object.

It is mostly done to make it in line with other functions in the
module.

(cherry picked from commit 7962e7f5757f77366bbcc4350ae43e5c0e4044c0)

diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c
index ce5f8292d004c822ab265b0ad1ad993d48c436ae..f52cdd6d7154bffeddd0258b2448e3dac4e17c6e 100644 (file)
--- a/bin/dig/dighost.c
+++ b/bin/dig/dighost.c
@@ -2908,9 +2908,9 @@ get_create_tls_context(dig_query_t *query, const bool is_https,
                }
 #endif /* HAVE_LIBNGHTTP2 */
 
-               sess_cache = isc_tlsctx_client_session_cache_new(
-                       mctx, ctx,
-                       ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE);
+               isc_tlsctx_client_session_cache_create(
+                       mctx, ctx, ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE,
+                       &sess_cache);
 
                result = isc_tlsctx_cache_add(
                        query->lookup->tls_ctx_cache, tlsctxname, transport,

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 08d8f28ea0bc89ae446f9973acf7d1e7377d14a2..0167421cd77fa931e335d1575abc79248b16b48d 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1072,9 +1072,10 @@ get_create_tlsctx(const dns_xfrin_ctx_t *xfr, isc_tlsctx_t **pctx,
 
                isc_tlsctx_enable_dot_client_alpn(tlsctx);
 
-               sess_cache = isc_tlsctx_client_session_cache_new(
+               isc_tlsctx_client_session_cache_create(
                        xfr->mctx, tlsctx,
-                       ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE);
+                       ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE,
+                       &sess_cache);
 
                found_store = NULL;
                result = isc_tlsctx_cache_add(xfr->tlsctx_cache, tlsname,

diff --git a/lib/isc/include/isc/tls.h b/lib/isc/include/isc/tls.h
index a732c20b20ecd512e969ba3f72642cd0c867afb3..efffffb0978d67b1dafa612c653b51315e0a4711 100644 (file)
--- a/lib/isc/include/isc/tls.h
+++ b/lib/isc/include/isc/tls.h
@@ -320,9 +320,10 @@ typedef struct isc_tlsctx_client_session_cache isc_tlsctx_client_session_cache_t
  * comparable to or surpass the size of a typical DNS message.
  */
 
-isc_tlsctx_client_session_cache_t *
-isc_tlsctx_client_session_cache_new(isc_mem_t *mctx, isc_tlsctx_t *ctx,
-                                   const size_t max_entries);
+void
+isc_tlsctx_client_session_cache_create(
+       isc_mem_t *mctx, isc_tlsctx_t *ctx, const size_t max_entries,
+       isc_tlsctx_client_session_cache_t **cachep);
 /*%<
  * Create a new TLS client session cache object.
  *
@@ -330,6 +331,7 @@ isc_tlsctx_client_session_cache_new(isc_mem_t *mctx, isc_tlsctx_t *ctx,
  *\li  'mctx' is a valid memory context object;
  *\li  'ctx' is a valid TLS context object;
  *\li  'max_entries' is a positive number;
+ *\li  'cachep' is a valid pointer to a pointer which must be equal to NULL.
  */
 
 void

diff --git a/lib/isc/tls.c b/lib/isc/tls.c
index f2b597454f91b79473d40983ac0c38fd8bcd4bb3..9be787e9d76a14d07c6e53e2cf7bf4374b2c5e08 100644 (file)
--- a/lib/isc/tls.c
+++ b/lib/isc/tls.c
@@ -1391,13 +1391,15 @@ struct isc_tlsctx_client_session_cache {
        isc_mutex_t lock;
 };
 
-isc_tlsctx_client_session_cache_t *
-isc_tlsctx_client_session_cache_new(isc_mem_t *mctx, isc_tlsctx_t *ctx,
-                                   const size_t max_entries) {
+void
+isc_tlsctx_client_session_cache_create(
+       isc_mem_t *mctx, isc_tlsctx_t *ctx, const size_t max_entries,
+       isc_tlsctx_client_session_cache_t **cachep) {
        isc_tlsctx_client_session_cache_t *nc;
 
        REQUIRE(ctx != NULL);
        REQUIRE(max_entries > 0);
+       REQUIRE(cachep != NULL && *cachep == NULL);
 
        nc = isc_mem_get(mctx, sizeof(*nc));
 
@@ -1412,7 +1414,7 @@ isc_tlsctx_client_session_cache_new(isc_mem_t *mctx, isc_tlsctx_t *ctx,
 
        nc->magic = TLSCTX_CLIENT_SESSION_CACHE_MAGIC;
 
-       return (nc);
+       *cachep = nc;
 }
 
 void

diff --git a/tests/isc/doh_test.c b/tests/isc/doh_test.c
index ce3854cfcacc1b7674dd098417da26b95732e44f..9f19b4e31b6ddea2230be86dbca6fd75f8973059 100644 (file)
--- a/tests/isc/doh_test.c
+++ b/tests/isc/doh_test.c
@@ -323,9 +323,10 @@ setup_test(void **state) {
        client_tlsctx = NULL;
        isc_tlsctx_createclient(&client_tlsctx);
        isc_tlsctx_enable_http2client_alpn(client_tlsctx);
-       client_sess_cache = isc_tlsctx_client_session_cache_new(
+       isc_tlsctx_client_session_cache_create(
                mctx, client_tlsctx,
-               ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE);
+               ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE,
+               &client_sess_cache);
 
        isc_quota_init(&listener_quota, 0);
        atomic_store(&check_listener_quota, false);

diff --git a/tests/isc/netmgr_test.c b/tests/isc/netmgr_test.c
index ceed9318517ce3cef3783a3e949f64f4ab1505b9..cb2c1debab48cfc26e3bcbf1230e8394fef96fd2 100644 (file)
--- a/tests/isc/netmgr_test.c
+++ b/tests/isc/netmgr_test.c
@@ -336,9 +336,10 @@ setup_test(void **state __attribute__((unused))) {
 
        isc_tlsctx_enable_dot_client_alpn(tcp_connect_tlsctx);
 
-       tcp_tlsctx_client_sess_cache = isc_tlsctx_client_session_cache_new(
+       isc_tlsctx_client_session_cache_create(
                mctx, tcp_connect_tlsctx,
-               ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE);
+               ISC_TLSCTX_CLIENT_SESSION_CACHE_DEFAULT_SIZE,
+               &tcp_tlsctx_client_sess_cache);
 
        return (0);
 }