upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 04:20:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3748-rename-tls-caches-creation-functions' into 'main'

Browse source 
Rename isc_tlsctx_cache_new() to isc_tlsctx_cache_create(), tlsctx_client_session_cache_new() to tlsctx_client_session_create()

Closes #3748

See merge request isc-projects/bind9!7269
This commit is contained in:
Artem Boldariev 2022-12-23 09:13:56 +00:00
commit c4097ec5d5
9 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/dig/dighost.c
View file

@ -630,7 +630,7 @@ make_empty_lookup(void) {
ISC_LIST_INIT(looknew->q);
ISC_LIST_INIT(looknew->my_server_list);
looknew->tls_ctx_cache = isc_tlsctx_cache_new(mctx);
isc_tlsctx_cache_create(mctx, &looknew->tls_ctx_cache);
isc_refcount_init(&looknew->references, 1);
@ -2880,9 +2880,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,

4
bin/named/server.c
View file

@ -8448,13 +8448,13 @@ load_configuration(const char *filename, named_server_t *server,
isc_tlsctx_cache_detach(&server->tlsctx_server_cache);
}
server->tlsctx_server_cache = isc_tlsctx_cache_new(named_g_mctx);
isc_tlsctx_cache_create(named_g_mctx, &server->tlsctx_server_cache);
if (server->tlsctx_client_cache != NULL) {
isc_tlsctx_cache_detach(&server->tlsctx_client_cache);
}
server->tlsctx_client_cache = isc_tlsctx_cache_new(named_g_mctx);
isc_tlsctx_cache_create(named_g_mctx, &server->tlsctx_client_cache);
dns_zonemgr_set_tlsctx_cache(server->zonemgr,
server->tlsctx_client_cache);

2
bin/nsupdate/nsupdate.c
View file

@ -967,7 +967,7 @@ setup_system(void) {
}
transport_list = dns_transport_list_new(gmctx);
tls_ctx_cache = isc_tlsctx_cache_new(gmctx);
isc_tlsctx_cache_create(gmctx, &tls_ctx_cache);
if (tls_client_key_file == NULL) {
result = create_name("tls-non-auth-client", namedata,

5
lib/dns/transport.c
View file

@ -498,9 +498,10 @@ dns_transport_get_tlsctx(dns_transport_t *transport, const isc_sockaddr_t *peer,
isc_tlsctx_enable_dot_client_alpn(tlsctx);
sess_cache = isc_tlsctx_client_session_cache_new(
isc_tlsctx_client_session_cache_create(
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(tlsctx_cache, tlsname,

15
lib/isc/include/isc/tls.h
View file

@ -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
@ -466,13 +468,14 @@ typedef enum {
} isc_tlsctx_cache_transport_t;
/*%< TLS context cache transport type values. */
isc_tlsctx_cache_t *
isc_tlsctx_cache_new(isc_mem_t *mctx);
void
isc_tlsctx_cache_create(isc_mem_t *mctx, isc_tlsctx_cache_t **cachep);
/*%<
* Create a new TLS context cache object.
*
* Requires:
*\li 'mctx' is a valid memory context.
*\li 'mctx' is a valid memory context;
*\li 'cachep' is a valid pointer to a pointer which must be equal to NULL.
*/
void

17
lib/isc/tls.c
View file

@ -1174,10 +1174,11 @@ struct isc_tlsctx_cache {
isc_ht_t *data;
};
isc_tlsctx_cache_t *
isc_tlsctx_cache_new(isc_mem_t *mctx) {
void
isc_tlsctx_cache_create(isc_mem_t *mctx, isc_tlsctx_cache_t **cachep) {
isc_tlsctx_cache_t *nc;
REQUIRE(cachep != NULL && *cachep == NULL);
nc = isc_mem_get(mctx, sizeof(*nc));
*nc = (isc_tlsctx_cache_t){ .magic = TLSCTX_CACHE_MAGIC };
@ -1187,7 +1188,7 @@ isc_tlsctx_cache_new(isc_mem_t *mctx) {
isc_ht_init(&nc->data, mctx, 5, ISC_HT_CASE_SENSITIVE);
isc_rwlock_init(&nc->rwlock, 0, 0);
return (nc);
*cachep = nc;
}
void
@ -1464,13 +1465,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));
@ -1485,7 +1488,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

2
tests/dns/dispatch_test.c
View file

@ -181,7 +181,7 @@ setup_test(void **state) {
testdata.region.length = sizeof(testdata.rbuf);
memset(testdata.message, 0, sizeof(testdata.message));
tls_tlsctx_client_cache = isc_tlsctx_cache_new(mctx);
isc_tlsctx_cache_create(mctx, &tls_tlsctx_client_cache);
if (isc_tlsctx_createserver(NULL, NULL, &tls_listen_tlsctx) !=
ISC_R_SUCCESS)

5
tests/isc/doh_test.c
View file

@ -319,9 +319,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);

5
tests/isc/netmgr_common.c
View file

@ -186,9 +186,10 @@ setup_netmgr_test(void **state) {
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);
}