upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix for windows compile create ssl contexts.

Browse source
This commit is contained in:
W.C.A. Wijngaards 2025-03-18 14:01:53 +01:00
parent b0d20e2d28
commit 30b9cb5f81
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -1,5 +1,6 @@
18 March 2025: Wouter 18 March 2025: Wouter
- Fix #1251: WSAPoll first argument cannot be NULL. - Fix #1251: WSAPoll first argument cannot be NULL.
- Fix for windows compile create ssl contexts.
17 March 2025: Wouter 17 March 2025: Wouter
- Fix representation of types GPOS and RESINFO, add rdf type for - Fix representation of types GPOS and RESINFO, add rdf type for

30
winrc/win_svc.c
View file

@ -363,16 +363,36 @@ service_init(int r, struct daemon** d, struct config_file** c)
return 0; return 0;
} }
if(cfg->ssl_service_key && cfg->ssl_service_key[0]) { if(cfg->ssl_service_key && cfg->ssl_service_key[0]) {
if(!(daemon->listen_sslctx = listen_sslctx_create( if(!(daemon->listen_dot_sslctx = listen_sslctx_create(
cfg->ssl_service_key, cfg->ssl_service_pem, NULL))) cfg->ssl_service_key, cfg->ssl_service_pem, NULL,
cfg->tls_ciphers, cfg->tls_ciphersuites,
(cfg->tls_session_ticket_keys.first &&
cfg->tls_session_ticket_keys.first->str[0] != 0),
1, 0))) {
fatal_exit("could not set up listen SSL_CTX"); fatal_exit("could not set up listen SSL_CTX");
}
#ifdef HAVE_NGHTTP2_NGHTTP2_H
if(cfg_has_https(cfg)) {
if(!(daemon->listen_doh_sslctx = listen_sslctx_create(
cfg->ssl_service_key, cfg->ssl_service_pem, NULL,
cfg->tls_ciphers, cfg->tls_ciphersuites,
(cfg->tls_session_ticket_keys.first &&
cfg->tls_session_ticket_keys.first->str[0] != 0),
0, 1))) {
fatal_exit("could not set up listen doh SSL_CTX");
}
}
#endif
#ifdef HAVE_NGTCP2 #ifdef HAVE_NGTCP2
if(!(daemon->quic_sslctx = quic_sslctx_create( if(cfg_has_quic(cfg)) {
cfg->ssl_service_key, cfg->ssl_service_pem, NULL))) if(!(daemon->listen_quic_sslctx = quic_sslctx_create(
cfg->ssl_service_key, cfg->ssl_service_pem, NULL))) {
fatal_exit("could not set up quic SSL_CTX"); fatal_exit("could not set up quic SSL_CTX");
}
}
#endif /* HAVE_NGTCP2 */ #endif /* HAVE_NGTCP2 */
} }
if(!(daemon->connect_sslctx = connect_sslctx_create(NULL, NULL, if(!(daemon->connect_dot_sslctx = connect_sslctx_create(NULL, NULL,
cfg->tls_cert_bundle, cfg->tls_win_cert))) cfg->tls_cert_bundle, cfg->tls_win_cert)))
fatal_exit("could not set up connect SSL_CTX"); fatal_exit("could not set up connect SSL_CTX");