diff --git a/.gitignore b/.gitignore index ff9ad76..ab6a7a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/unbound-1.24.2.tar.gz +SOURCES/unbound-1.25.1.tar.gz diff --git a/.unbound.metadata b/.unbound.metadata index a90817b..28eabc3 100644 --- a/.unbound.metadata +++ b/.unbound.metadata @@ -1 +1 @@ -89220193962044660fb5ec375601b3faccd4bd5b SOURCES/unbound-1.24.2.tar.gz +382e12658a8c8e63ffb3edb1c6592b54a7a75ce3 SOURCES/unbound-1.25.1.tar.gz diff --git a/SOURCES/unbound-1.24.2.tar.gz.asc b/SOURCES/unbound-1.24.2.tar.gz.asc deleted file mode 100644 index f4a04ca..0000000 --- a/SOURCES/unbound-1.24.2.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQJIBAABCAAyFiEElI60IyLF0At5NA9dz/M0TZCHpJAFAmkm1EQUHGdlb3JnZUBu -bG5ldGxhYnMubmwACgkQz/M0TZCHpJBShg//WYjN8jarUIfeH1IhnnqxTBxZ5CvT -WUkgQy5laBIeWRE9l+rWdG7KRVjIH5wDLN9kuwSA6daO1owwxubrj20czkyaByFi -Mfb2V0FgpUwvfqXILEW0taEzQyGnzJy/UPV3nZXWWaLeRIrjVb5rNtazprQMlFSV -1OhCJX77BI1NNC87/I5HGPO5dAR8epe3+6tdXP29vDJHnkWkEvy17y8uTxDwRA/b -Yip9yiT7HbOHQsQhfFwQ747Tzc6CZ8XkRPLd2QNWA6tGaqQINDJv7N8/VqxqnjXF -wtpsRpn/qBx8m3T6u6/au0LiwnGUikmPyjsPZapIvlgP/BW33wU/HO2AxQWFO234 -5wdZ37BSchvHJFPtNJXX3Wak4FcWbe41GlP9dHCD74D/d1uG9DyeuMC5aoGStQZu -ldMzCoNwLKS4bfQyFsNA1rldinNRtoz7/Ac2Y9+Z6VhI6d/uqb+FBmenavvqQblz -bFccL0nQ4I4xjhGFqSjfTrQgwHQnyKKTToZzTSABqssG97m3F6twdrcZOqYCotLN -9ttXdwEwOUIpVD2UUbjS3LfZHBuQDjIETqgC89UZb6cOVzLbTFfnAQBDhFTGvqq5 -ohhAiZa9ePg8gXuziPtxp7AyQ+izvWESn7Af1yuXu315xuU7OG/7Wh1wyN2wjD5+ -vbIU556z7rrFT30= -=vyR7 ------END PGP SIGNATURE----- diff --git a/SOURCES/unbound-1.25-tls-crypto-policy-default.patch b/SOURCES/unbound-1.25-tls-crypto-policy-default.patch deleted file mode 100644 index 7b532eb..0000000 --- a/SOURCES/unbound-1.25-tls-crypto-policy-default.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 87e5c3ccad91c72166ed72c7366d8681308d84a8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= -Date: Mon, 9 Feb 2026 15:40:51 +0100 -Subject: [PATCH] Add a new build-time option for system TLS - -We want to use crypto-policy provided configuration always in our -builds. Allow changing the default of tls-use-system-policy-versions at -build time by a simple configure parameter. ---- - unbound-1.24.2/configure.ac | 11 +++++++++++ - unbound-1.24.2/util/config_file.c | 5 ++++- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/unbound-1.24.2/configure.ac b/unbound-1.24.2/configure.ac -index 6a43fd5..13c910f 100644 ---- a/unbound-1.24.2/configure.ac -+++ b/unbound-1.24.2/configure.ac -@@ -2067,6 +2067,17 @@ case "$enable_ipsecmod" in - ;; - esac - -+# check for system TLS preference if requested -+AC_ARG_ENABLE(system-tls, AS_HELP_STRING([--enable-system-tls],[Enable preference of system configured TLS socket options])) -+case "$enable_system_tls" in -+ yes) -+ AC_DEFINE([USE_SYSTEM_TLS], [1], [Define to 1 to prefer TLS crypto settings from the system.]) -+ ;; -+ no|*) -+ # nothing -+ ;; -+esac -+ - # check for ipset if requested - AC_ARG_ENABLE(ipset, AS_HELP_STRING([--enable-ipset],[enable ipset module])) - case "$enable_ipset" in -diff --git a/unbound-1.24.2/util/config_file.c b/unbound-1.24.2/util/config_file.c -index 1565b05..8079ec9 100644 ---- a/unbound-1.24.2/util/config_file.c -+++ b/unbound-1.24.2/util/config_file.c -@@ -71,6 +71,9 @@ - #ifdef HAVE_PWD_H - #include - #endif -+#ifndef USE_SYSTEM_TLS -+#define USE_SYSTEM_TLS 0 -+#endif - - /** from cfg username, after daemonize setup performed */ - uid_t cfg_uid = (uid_t)-1; -@@ -129,7 +132,7 @@ config_create(void) - cfg->tls_cert_bundle = NULL; - cfg->tls_win_cert = 0; - cfg->tls_use_sni = 1; -- cfg->tls_use_system_policy_versions = 0; -+ cfg->tls_use_system_policy_versions = USE_SYSTEM_TLS; - cfg->https_port = UNBOUND_DNS_OVER_HTTPS_PORT; - if(!(cfg->http_endpoint = strdup("/dns-query"))) goto error_exit; - cfg->http_max_streams = 100; --- -2.52.0 - diff --git a/SOURCES/unbound-1.25-tls-crypto-policy.patch b/SOURCES/unbound-1.25-tls-crypto-policy.patch deleted file mode 100644 index 7f6f911..0000000 --- a/SOURCES/unbound-1.25-tls-crypto-policy.patch +++ /dev/null @@ -1,483 +0,0 @@ -From 315d29b33f9766e7ecb91fcfd4c1238d92aefd9e Mon Sep 17 00:00:00 2001 -From: Yorgos Thessalonikefs -Date: Mon, 22 Sep 2025 18:22:36 +0200 -Subject: [PATCH] - Fix #1346: [FR] Please allow back TLS 1.2. - 'tls-use-system-policy-versions' is introduced to allow Unbound to use any - system available TLS version when serving TLS. - ---- - unbound-1.24.2/daemon/remote.c | 2 +- - unbound-1.24.2/daemon/unbound.c | 2 +- - unbound-1.24.2/dnstap/unbound-dnstap-socket.c | 2 +- - unbound-1.24.2/doc/example.conf.in | 26 ++++++--- - unbound-1.24.2/doc/unbound.conf.5.in | 55 ++++++++++++++----- - unbound-1.24.2/doc/unbound.conf.rst | 32 ++++++++--- - unbound-1.24.2/util/config_file.c | 3 + - unbound-1.24.2/util/config_file.h | 2 + - unbound-1.24.2/util/configlexer.lex | 1 + - unbound-1.24.2/util/configparser.y | 11 ++++ - unbound-1.24.2/util/net_help.c | 54 +++++++++--------- - unbound-1.24.2/util/net_help.h | 8 ++- - unbound-1.24.2/winrc/win_svc.c | 4 +- - 13 files changed, 138 insertions(+), 64 deletions(-) - -diff --git a/unbound-1.24.2/daemon/remote.c b/unbound-1.24.2/daemon/remote.c -index d8ee7fa..06d1d34 100644 ---- a/unbound-1.24.2/daemon/remote.c -+++ b/unbound-1.24.2/daemon/remote.c -@@ -153,7 +153,7 @@ remote_setup_ctx(struct daemon_remote* rc, struct config_file* cfg) - log_crypto_err("could not SSL_CTX_new"); - return 0; - } -- if(!listen_sslctx_setup(rc->ctx)) { -+ if(!listen_sslctx_setup(rc->ctx, cfg->tls_use_system_policy_versions)) { - return 0; - } - -diff --git a/unbound-1.24.2/daemon/unbound.c b/unbound-1.24.2/daemon/unbound.c -index 164d0fb..6888047 100644 ---- a/unbound-1.24.2/daemon/unbound.c -+++ b/unbound-1.24.2/daemon/unbound.c -@@ -473,7 +473,7 @@ setup_listen_sslctx(void** ctx, int is_dot, int is_doh, struct config_file* cfg) - cfg->tls_ciphers, cfg->tls_ciphersuites, - (cfg->tls_session_ticket_keys.first && - cfg->tls_session_ticket_keys.first->str[0] != 0), -- is_dot, is_doh))) { -+ is_dot, is_doh, cfg->tls_use_system_policy_versions))) { - fatal_exit("could not set up listen SSL_CTX"); - } - } -diff --git a/unbound-1.24.2/dnstap/unbound-dnstap-socket.c b/unbound-1.24.2/dnstap/unbound-dnstap-socket.c -index a01627d..c0d344c 100644 ---- a/unbound-1.24.2/dnstap/unbound-dnstap-socket.c -+++ b/unbound-1.24.2/dnstap/unbound-dnstap-socket.c -@@ -347,7 +347,7 @@ static struct tap_socket* tap_socket_new_tlsaccept(char* ip, - s->ev_cb = ev_cb; - s->data = data; - s->sslctx = listen_sslctx_create(server_key, server_cert, verifypem, -- NULL, NULL, 0, 0, 0); -+ NULL, NULL, 0, 0, 0, 0); - if(!s->sslctx) { - log_err("could not create ssl context"); - free(s->ip); -diff --git a/unbound-1.24.2/doc/example.conf.in b/unbound-1.24.2/doc/example.conf.in -index cf10b85..ecdc65c 100644 ---- a/unbound-1.24.2/doc/example.conf.in -+++ b/unbound-1.24.2/doc/example.conf.in -@@ -950,21 +950,26 @@ server: - # https-port: 443 - # quic-port: 853 - -+ # Also serve tls on these port numbers (eg. 443, ...), by listing -+ # tls-additional-port: portno for each of the port numbers. -+ - # cipher setting for TLSv1.2 - # tls-ciphers: "DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256" - # cipher setting for TLSv1.3 - # tls-ciphersuites: "TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_8_SHA256:TLS_AES_128_CCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256" - -- # Pad responses to padded queries received over TLS -- # pad-responses: yes -- -- # Padded responses will be padded to the closest multiple of this size. -- # pad-responses-block-size: 468 -- - # Use the SNI extension for TLS connections. Default is yes. - # Changing the value requires a reload. - # tls-use-sni: yes - -+ # Allow general-purpose version-flexible TLS server configuration that -+ # may be further restricted by the system's policy. -+ # Use only if you want to support legacy TLS client connections. -+ # Default is no and Unbound will only use the latest available TLS -+ # version. -+ # Changing the value requires a reload. -+ # tls-use-system-policy-versions: no -+ - # Add the secret file for TLS Session Ticket. - # Secret file must be 80 bytes of random data. - # First key use to encrypt and decrypt TLS session tickets. -@@ -985,15 +990,18 @@ server: - # and on other systems, the default openssl certificates - # tls-system-cert: no - -+ # Pad responses to padded queries received over TLS -+ # pad-responses: yes -+ -+ # Padded responses will be padded to the closest multiple of this size. -+ # pad-responses-block-size: 468 -+ - # Pad queries over TLS upstreams - # pad-queries: yes - - # Padded queries will be padded to the closest multiple of this size. - # pad-queries-block-size: 128 - -- # Also serve tls on these port numbers (eg. 443, ...), by listing -- # tls-additional-port: portno for each of the port numbers. -- - # HTTP endpoint to provide DNS-over-HTTPS service on. - # http-endpoint: "/dns-query" - -diff --git a/unbound-1.24.2/doc/unbound.conf.5.in b/unbound-1.24.2/doc/unbound.conf.5.in -index a5857ac..7ec7860 100644 ---- a/unbound-1.24.2/doc/unbound.conf.5.in -+++ b/unbound-1.24.2/doc/unbound.conf.5.in -@@ -1218,6 +1218,47 @@ Default: \(dq\(dq - .UNINDENT - .INDENT 0.0 - .TP -+.B tls\-use\-sni: \fI\fP -+Enable or disable sending the SNI extension on TLS connections. -+.sp -+\fBNOTE:\fP -+.INDENT 7.0 -+.INDENT 3.5 -+Changing the value requires a reload. -+.UNINDENT -+.UNINDENT -+.sp -+Default: yes -+.UNINDENT -+.INDENT 0.0 -+.TP -+.B tls\-use\-system\-policy\-versions: \fI\fP -+Enable or disable general\-puspose version\-flexible TLS server configuration -+when serving TLS. -+This will allow the whole list of available TLS versions provided by the -+crypto library, which may have been further restricted by the system\(aqs -+crypto policy. -+.sp -+By default Unbound only uses the latest available TLS version. -+.sp -+\fBCAUTION:\fP -+.INDENT 7.0 -+.INDENT 3.5 -+Use only if you want to support legacy TLS client connections. -+.UNINDENT -+.UNINDENT -+.sp -+\fBNOTE:\fP -+.INDENT 7.0 -+.INDENT 3.5 -+Changing the value requires a reload. -+.UNINDENT -+.UNINDENT -+.sp -+Default: no -+.UNINDENT -+.INDENT 0.0 -+.TP - .B pad\-responses: \fI\fP - If enabled, TLS serviced queries that contained an EDNS Padding option will - cause responses padded to the closest multiple of the size specified in -@@ -1251,20 +1292,6 @@ Default: 128 - .UNINDENT - .INDENT 0.0 - .TP --.B tls\-use\-sni: \fI\fP --Enable or disable sending the SNI extension on TLS connections. --.sp --\fBNOTE:\fP --.INDENT 7.0 --.INDENT 3.5 --Changing the value requires a reload. --.UNINDENT --.UNINDENT --.sp --Default: yes --.UNINDENT --.INDENT 0.0 --.TP - .B https\-port: \fI\fP - The port number on which to provide DNS\-over\-HTTPS service. - Only interfaces configured with that port number as @number get the HTTPS -diff --git a/unbound-1.24.2/doc/unbound.conf.rst b/unbound-1.24.2/doc/unbound.conf.rst -index d83816c..555b1c8 100644 ---- a/unbound-1.24.2/doc/unbound.conf.rst -+++ b/unbound-1.24.2/doc/unbound.conf.rst -@@ -1103,6 +1103,30 @@ These options are part of the **server:** clause. - Default: "" - - -+@@UAHL@unbound.conf@tls-use-sni@@: ** -+ Enable or disable sending the SNI extension on TLS connections. -+ -+ .. note:: Changing the value requires a reload. -+ -+ Default: yes -+ -+ -+@@UAHL@unbound.conf@tls-use-system-policy-versions@@: ** -+ Enable or disable general-puspose version-flexible TLS server configuration -+ when serving TLS. -+ This will allow the whole list of available TLS versions provided by the -+ crypto library, which may have been further restricted by the system's -+ crypto policy. -+ -+ By default Unbound only uses the latest available TLS version. -+ -+ .. caution:: Use only if you want to support legacy TLS client connections. -+ -+ .. note:: Changing the value requires a reload. -+ -+ Default: no -+ -+ - @@UAHL@unbound.conf@pad-responses@@: ** - If enabled, TLS serviced queries that contained an EDNS Padding option will - cause responses padded to the closest multiple of the size specified in -@@ -1132,14 +1156,6 @@ These options are part of the **server:** clause. - Default: 128 - - --@@UAHL@unbound.conf@tls-use-sni@@: ** -- Enable or disable sending the SNI extension on TLS connections. -- -- .. note:: Changing the value requires a reload. -- -- Default: yes -- -- - @@UAHL@unbound.conf@https-port@@: ** - The port number on which to provide DNS-over-HTTPS service. - Only interfaces configured with that port number as @number get the HTTPS -diff --git a/unbound-1.24.2/util/config_file.c b/unbound-1.24.2/util/config_file.c -index 25c2b3e..1565b05 100644 ---- a/unbound-1.24.2/util/config_file.c -+++ b/unbound-1.24.2/util/config_file.c -@@ -129,6 +129,7 @@ config_create(void) - cfg->tls_cert_bundle = NULL; - cfg->tls_win_cert = 0; - cfg->tls_use_sni = 1; -+ cfg->tls_use_system_policy_versions = 0; - cfg->https_port = UNBOUND_DNS_OVER_HTTPS_PORT; - if(!(cfg->http_endpoint = strdup("/dns-query"))) goto error_exit; - cfg->http_max_streams = 100; -@@ -629,6 +630,7 @@ int config_set_option(struct config_file* cfg, const char* opt, - else S_STR("tls-ciphers:", tls_ciphers) - else S_STR("tls-ciphersuites:", tls_ciphersuites) - else S_YNO("tls-use-sni:", tls_use_sni) -+ else S_YNO("tls-use-system-policy-versions:", tls_use_system_policy_versions) - else S_NUMBER_NONZERO("https-port:", https_port) - else S_STR("http-endpoint:", http_endpoint) - else S_NUMBER_NONZERO("http-max-streams:", http_max_streams) -@@ -1181,6 +1183,7 @@ config_get_option(struct config_file* cfg, const char* opt, - else O_STR(opt, "tls-ciphers", tls_ciphers) - else O_STR(opt, "tls-ciphersuites", tls_ciphersuites) - else O_YNO(opt, "tls-use-sni", tls_use_sni) -+ else O_YNO(opt, "tls-use-system-policy-versions", tls_use_system_policy_versions) - else O_DEC(opt, "https-port", https_port) - else O_STR(opt, "http-endpoint", http_endpoint) - else O_UNS(opt, "http-max-streams", http_max_streams) -diff --git a/unbound-1.24.2/util/config_file.h b/unbound-1.24.2/util/config_file.h -index f77538b..59b4ae5 100644 ---- a/unbound-1.24.2/util/config_file.h -+++ b/unbound-1.24.2/util/config_file.h -@@ -148,6 +148,8 @@ struct config_file { - char* tls_ciphersuites; - /** if SNI is to be used */ - int tls_use_sni; -+ /** if all TLS versions can be used; based on system policy (if any) */ -+ int tls_use_system_policy_versions; - - /** port on which to provide DNS over HTTPS service */ - int https_port; -diff --git a/unbound-1.24.2/util/configlexer.lex b/unbound-1.24.2/util/configlexer.lex -index 0ba8d60..22f98e4 100644 ---- a/unbound-1.24.2/util/configlexer.lex -+++ b/unbound-1.24.2/util/configlexer.lex -@@ -262,6 +262,7 @@ tls-session-ticket-keys{COLON} { YDVAR(1, VAR_TLS_SESSION_TICKET_KEYS) } - tls-ciphers{COLON} { YDVAR(1, VAR_TLS_CIPHERS) } - tls-ciphersuites{COLON} { YDVAR(1, VAR_TLS_CIPHERSUITES) } - tls-use-sni{COLON} { YDVAR(1, VAR_TLS_USE_SNI) } -+tls-use-system-policy-versions{COLON} { YDVAR(1, VAR_TLS_USE_SYSTEM_POLICY_VERSIONS) } - https-port{COLON} { YDVAR(1, VAR_HTTPS_PORT) } - http-endpoint{COLON} { YDVAR(1, VAR_HTTP_ENDPOINT) } - http-max-streams{COLON} { YDVAR(1, VAR_HTTP_MAX_STREAMS) } -diff --git a/unbound-1.24.2/util/configparser.y b/unbound-1.24.2/util/configparser.y -index bef1fd3..bf9c196 100644 ---- a/unbound-1.24.2/util/configparser.y -+++ b/unbound-1.24.2/util/configparser.y -@@ -199,6 +199,7 @@ extern struct config_parser_state* cfg_parser; - %token VAR_DISCARD_TIMEOUT VAR_WAIT_LIMIT VAR_WAIT_LIMIT_COOKIE - %token VAR_WAIT_LIMIT_NETBLOCK VAR_WAIT_LIMIT_COOKIE_NETBLOCK - %token VAR_STREAM_WAIT_SIZE VAR_TLS_CIPHERS VAR_TLS_CIPHERSUITES VAR_TLS_USE_SNI -+%token VAR_TLS_USE_SYSTEM_POLICY_VERSIONS - %token VAR_IPSET VAR_IPSET_NAME_V4 VAR_IPSET_NAME_V6 - %token VAR_TLS_SESSION_TICKET_KEYS VAR_RPZ VAR_TAGS VAR_RPZ_ACTION_OVERRIDE - %token VAR_RPZ_CNAME_OVERRIDE VAR_RPZ_LOG VAR_RPZ_LOG_NAME -@@ -347,6 +348,7 @@ content_server: server_num_threads | server_verbosity | server_port | - server_tls_ciphersuites | server_tls_session_ticket_keys | - server_answer_cookie | server_cookie_secret | server_ip_ratelimit_cookie | - server_tls_use_sni | server_edns_client_string | -+ server_tls_use_system_policy_versions | - server_edns_client_string_opcode | server_nsid | - server_zonemd_permissive_mode | server_max_reuse_tcp_queries | - server_tcp_reuse_timeout | server_tcp_auth_query_timeout | -@@ -1155,6 +1157,15 @@ server_tls_use_sni: VAR_TLS_USE_SNI STRING_ARG - free($2); - } - ; -+server_tls_use_system_policy_versions: VAR_TLS_USE_SYSTEM_POLICY_VERSIONS STRING_ARG -+ { -+ OUTYY(("P(server_tls_use_system_policy_versions:%s)\n", $2)); -+ if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0) -+ yyerror("expected yes or no."); -+ else cfg_parser->cfg->tls_use_system_policy_versions = (strcmp($2, "yes")==0); -+ free($2); -+ } -+ ; - server_https_port: VAR_HTTPS_PORT STRING_ARG - { - OUTYY(("P(server_https_port:%s)\n", $2)); -diff --git a/unbound-1.24.2/util/net_help.c b/unbound-1.24.2/util/net_help.c -index 6ce0d91..426ace9 100644 ---- a/unbound-1.24.2/util/net_help.c -+++ b/unbound-1.24.2/util/net_help.c -@@ -1226,7 +1226,7 @@ setup_ticket_keys_cb(void* sslctx) - #endif /* HAVE_SSL */ - - int --listen_sslctx_setup(void* ctxt) -+listen_sslctx_setup(void* ctxt, int use_system_versions) - { - #ifdef HAVE_SSL - SSL_CTX* ctx = (SSL_CTX*)ctxt; -@@ -1238,35 +1238,37 @@ listen_sslctx_setup(void* ctxt) - return 0; - } - #endif -- if((SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3) & SSL_OP_NO_SSLv3) -- != SSL_OP_NO_SSLv3){ -- log_crypto_err("could not set SSL_OP_NO_SSLv3"); -- return 0; -- } -+ if(!use_system_versions) { -+ if((SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3) & SSL_OP_NO_SSLv3) -+ != SSL_OP_NO_SSLv3){ -+ log_crypto_err("could not set SSL_OP_NO_SSLv3"); -+ return 0; -+ } - #if defined(SSL_OP_NO_TLSv1) && defined(SSL_OP_NO_TLSv1_1) -- /* if we have tls 1.1 disable 1.0 */ -- if((SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1) & SSL_OP_NO_TLSv1) -- != SSL_OP_NO_TLSv1){ -- log_crypto_err("could not set SSL_OP_NO_TLSv1"); -- return 0; -- } -+ /* if we have tls 1.1 disable 1.0 */ -+ if((SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1) & SSL_OP_NO_TLSv1) -+ != SSL_OP_NO_TLSv1){ -+ log_crypto_err("could not set SSL_OP_NO_TLSv1"); -+ return 0; -+ } - #endif - #if defined(SSL_OP_NO_TLSv1_1) && defined(SSL_OP_NO_TLSv1_2) -- /* if we have tls 1.2 disable 1.1 */ -- if((SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_1) & SSL_OP_NO_TLSv1_1) -- != SSL_OP_NO_TLSv1_1){ -- log_crypto_err("could not set SSL_OP_NO_TLSv1_1"); -- return 0; -- } -+ /* if we have tls 1.2 disable 1.1 */ -+ if((SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_1) & SSL_OP_NO_TLSv1_1) -+ != SSL_OP_NO_TLSv1_1){ -+ log_crypto_err("could not set SSL_OP_NO_TLSv1_1"); -+ return 0; -+ } - #endif - #if defined(SSL_OP_NO_TLSv1_2) && defined(SSL_OP_NO_TLSv1_3) -- /* if we have tls 1.3 disable 1.2 */ -- if((SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_2) & SSL_OP_NO_TLSv1_2) -- != SSL_OP_NO_TLSv1_2){ -- log_crypto_err("could not set SSL_OP_NO_TLSv1_2"); -- return 0; -- } -+ /* if we have tls 1.3 disable 1.2 */ -+ if((SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_2) & SSL_OP_NO_TLSv1_2) -+ != SSL_OP_NO_TLSv1_2){ -+ log_crypto_err("could not set SSL_OP_NO_TLSv1_2"); -+ return 0; -+ } - #endif -+ } - #if defined(SSL_OP_NO_RENEGOTIATION) - /* disable client renegotiation */ - if((SSL_CTX_set_options(ctx, SSL_OP_NO_RENEGOTIATION) & -@@ -1341,7 +1343,7 @@ listen_sslctx_setup_2(void* ctxt) - void* listen_sslctx_create(const char* key, const char* pem, - const char* verifypem, const char* tls_ciphers, - const char* tls_ciphersuites, int set_ticket_keys_cb, -- int is_dot, int is_doh) -+ int is_dot, int is_doh, int use_system_versions) - { - #ifdef HAVE_SSL - SSL_CTX* ctx = SSL_CTX_new(SSLv23_server_method()); -@@ -1359,7 +1361,7 @@ void* listen_sslctx_create(const char* key, const char* pem, - SSL_CTX_free(ctx); - return NULL; - } -- if(!listen_sslctx_setup(ctx)) { -+ if(!listen_sslctx_setup(ctx, use_system_versions)) { - SSL_CTX_free(ctx); - return NULL; - } -diff --git a/unbound-1.24.2/util/net_help.h b/unbound-1.24.2/util/net_help.h -index 278e370..7b8a206 100644 ---- a/unbound-1.24.2/util/net_help.h -+++ b/unbound-1.24.2/util/net_help.h -@@ -478,9 +478,11 @@ void log_cert(unsigned level, const char* str, void* cert); - /** - * Set SSL_OP_NOxxx options on SSL context to disable bad crypto - * @param ctxt: SSL_CTX* -+ * @param use_system_versions: rely on the system policy (if any) for allowed -+ * TLS versions - * @return false on failure. - */ --int listen_sslctx_setup(void* ctxt); -+int listen_sslctx_setup(void* ctxt, int use_system_versions); - - /** - * Further setup of listening SSL context, after keys loaded. -@@ -499,12 +501,14 @@ void listen_sslctx_setup_2(void* ctxt); - * to be set. - * @param is_dot: if the TLS connection is for DoT to set the appropriate ALPN. - * @param is_doh: if the TLS connection is for DoH to set the appropriate ALPN. -+ * @param use_system_versions: rely on the system policy (if any) for allowed -+ * TLS versions - * return SSL_CTX* or NULL on failure (logged). - */ - void* listen_sslctx_create(const char* key, const char* pem, - const char* verifypem, const char* tls_ciphers, - const char* tls_ciphersuites, int set_ticket_keys_cb, -- int is_dot, int is_doh); -+ int is_dot, int is_doh, int use_system_versions); - - /** - * create SSL connect context -diff --git a/unbound-1.24.2/winrc/win_svc.c b/unbound-1.24.2/winrc/win_svc.c -index 429b045..6fca0c7 100644 ---- a/unbound-1.24.2/winrc/win_svc.c -+++ b/unbound-1.24.2/winrc/win_svc.c -@@ -369,7 +369,7 @@ service_init(int r, struct daemon** d, struct config_file** c) - cfg->tls_ciphers, cfg->tls_ciphersuites, - (cfg->tls_session_ticket_keys.first && - cfg->tls_session_ticket_keys.first->str[0] != 0), -- 1, 0))) { -+ 1, 0, cfg->tls_use_system_policy_versions))) { - fatal_exit("could not set up listen SSL_CTX"); - } - #ifdef HAVE_NGHTTP2_NGHTTP2_H -@@ -379,7 +379,7 @@ service_init(int r, struct daemon** d, struct config_file** c) - cfg->tls_ciphers, cfg->tls_ciphersuites, - (cfg->tls_session_ticket_keys.first && - cfg->tls_session_ticket_keys.first->str[0] != 0), -- 0, 1))) { -+ 0, 1, cfg->tls_use_system_policy_versions))) { - fatal_exit("could not set up listen doh SSL_CTX"); - } - } --- -2.52.0 - diff --git a/SOURCES/unbound-1.25.1.tar.gz.asc b/SOURCES/unbound-1.25.1.tar.gz.asc new file mode 100644 index 0000000..c115f44 --- /dev/null +++ b/SOURCES/unbound-1.25.1.tar.gz.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQGzBAABCAAdFiEEIxAYaQxNkD70GRRqoUQyPeqs30UFAmoNcTMACgkQoUQyPeqs +30XOtQv+KDxps+HwnHZBnwz2VmapOT4N2q8TR5RN60kdmUYEBvErvskS4gQPTJ2T +judQCvMBCF5g1tUW+744/jJRA/7tWyYPhdLveAEWa7uNrw311/pFSByLO8Do/H56 +JJwO+JPOxjiIqn98QhVgTtV+M4ljMYJpfaMt1M6ABo533yp5o56I3u6wEIiien7W +0W37O/fYAyzlMwrfzKQyUXrUuhkwzVdZAF5kWpi+WGU7HjaLMPhr2P+q/klIzy6q +6rYtVn1gEFSyMFxr6va2JIzwvK5cLETbNqPpbJy7EmFLqNzzPItEnjfYznOWn/TN +D9SdTMnEieKoPpv6WuTTMAnC++VV3Xp8adka0j3e0zvaul7gwwv6Cwr17OkULyev +OPaFQXHypKt2FVVarKiX0MrAyLelHXEPrvkGwTbnY3AouSsUtYwra10HdXlH1pHa +lmVFOJNQMbA6YB9n5dEOyHC4j6s2H7m7HfyHgsn3XTW2cxO/QcDJTHcZaH2VG7Io +8HSabWFf +=jpd4 +-----END PGP SIGNATURE----- diff --git a/SOURCES/unbound-fedora-config.patch b/SOURCES/unbound-fedora-config.patch index 6fc5649..d6cb0cd 100644 --- a/SOURCES/unbound-fedora-config.patch +++ b/SOURCES/unbound-fedora-config.patch @@ -1,4 +1,4 @@ -From a8be97bada623287cdd911c7a4549bbceef9fea0 Mon Sep 17 00:00:00 2001 +From b57a1fbfb38399a40f6bde25dd49c82468e97298 Mon Sep 17 00:00:00 2001 From: Tomas Korbar Date: Tue, 4 Feb 2025 09:48:12 +0100 Subject: [PATCH] Customize unbound.conf for Fedora defaults @@ -7,13 +7,13 @@ Set some Fedora/RHEL specific changes to example configuration file. By patching upstream provided config file we would not need to manually update external copy in source RPM. --- - unbound-1.24.2/doc/example.conf.in | 33 ++++++++++++++++++++++++++++-- + doc/example.conf.in | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) -diff --git a/unbound-1.24.2/doc/example.conf.in b/unbound-1.24.2/doc/example.conf.in -index fda565c..cf10b85 100644 ---- a/unbound-1.24.2/doc/example.conf.in -+++ b/unbound-1.24.2/doc/example.conf.in +diff --git a/unbound-1.25.1/doc/example.conf.in b/unbound-1.25.1/doc/example.conf.in +index 2c6d63409..d722fc4dd 100644 +--- a/unbound-1.25.1/doc/example.conf.in ++++ b/unbound-1.25.1/doc/example.conf.in @@ -51,11 +51,19 @@ server: # specify 0.0.0.0 and ::0 to bind to all available interfaces. # specify every interface[@port] on a new 'interface:' labelled line. @@ -23,7 +23,7 @@ index fda565c..cf10b85 100644 # interface: 192.0.2.153 # interface: 192.0.2.154 # interface: 192.0.2.154@5003 - # interface: 2001:DB8::5 + # interface: 2001:db8::5 # interface: eth0@5003 + # + # for dns over tls and raw dns over port 80 @@ -34,7 +34,7 @@ index fda565c..cf10b85 100644 # enable this feature to copy the source address of queries to reply. # Socket options are not supported on all platforms. experimental. -@@ -295,6 +303,8 @@ server: +@@ -298,6 +306,8 @@ server: # nat64-prefix: 64:ff9b::0/96 # Enable UDP, "yes" or "no". @@ -43,7 +43,7 @@ index fda565c..cf10b85 100644 # do-udp: yes # Enable TCP, "yes" or "no". -@@ -330,6 +340,9 @@ server: +@@ -333,6 +343,9 @@ server: # can be dropped. Default is 0, disabled. In seconds, such as 3. # sock-queue-timeout: 0 @@ -53,7 +53,7 @@ index fda565c..cf10b85 100644 # Use systemd socket activation for UDP, TCP, and control sockets. # use-systemd: no -@@ -919,6 +932,8 @@ server: +@@ -927,6 +940,8 @@ server: # you need to do the reverse notation yourself. # local-data-ptr: "192.0.2.3 www.example.com" @@ -62,7 +62,7 @@ index fda565c..cf10b85 100644 # tag a localzone with a list of tag names (in "" with spaces between) # local-zone-tag: "example.com" "tag2 tag3" -@@ -929,8 +944,8 @@ server: +@@ -953,8 +968,8 @@ server: # the TLS stream, and over HTTPS using HTTP/2 as specified in RFC8484. # Give the certificate to use and private key. # default is "" (disabled). requires restart to take effect. @@ -73,7 +73,7 @@ index fda565c..cf10b85 100644 # tls-port: 853 # https-port: 443 # quic-port: 853 -@@ -1184,6 +1199,12 @@ remote-control: +@@ -1212,6 +1227,12 @@ remote-control: # unbound-control certificate file. # control-cert-file: "@UNBOUND_RUN_DIR@/unbound_control.pem" @@ -86,7 +86,7 @@ index fda565c..cf10b85 100644 # Stub zones. # Create entries like below, to make all queries for 'example.com' and # 'example.org' go to the given list of nameservers. list zero or more -@@ -1204,6 +1225,10 @@ remote-control: +@@ -1232,6 +1253,10 @@ remote-control: # name: "example.org" # stub-host: ns.example.com. @@ -97,7 +97,7 @@ index fda565c..cf10b85 100644 # Forward zones # Create entries like below, to make all queries for 'example.com' and # 'example.org' go to the given list of servers. These servers have to handle -@@ -1221,6 +1246,10 @@ remote-control: +@@ -1249,6 +1274,10 @@ remote-control: # forward-zone: # name: "example.org" # forward-host: fwd.example.com @@ -109,5 +109,5 @@ index fda565c..cf10b85 100644 # Authority zones # The data for these zones is kept locally, from a file or downloaded. -- -2.52.0 +2.54.0 diff --git a/SPECS/unbound.spec b/SPECS/unbound.spec index 8d9e8d9..8eefbc9 100644 --- a/SPECS/unbound.spec +++ b/SPECS/unbound.spec @@ -30,8 +30,8 @@ Summary: Validating, recursive, and caching DNS(SEC) resolver Name: unbound -Version: 1.24.2 -Release: 2%{?extra_version:.%{extra_version}}%{?dist} +Version: 1.25.1 +Release: 1%{?extra_version:.%{extra_version}}%{?dist} License: BSD Url: https://nlnetlabs.nl/projects/unbound/ Source: https://nlnetlabs.nl/downloads/%{name}/%{name}-%{version}%{?extra_version}.tar.gz @@ -63,11 +63,7 @@ Source26: unbound-as112-networks.conf Source27: tmpfiles-unbound-libs.conf # Downstream configuration changes -Patch1: unbound-fedora-config.patch -# https://github.com/NLnetLabs/unbound/pull/1349 -Patch2: %{forgeurl}/pull/1349.patch#/unbound-1.25-tls-crypto-policy.patch -# https://github.com/NLnetLabs/unbound/pull/1401 -Patch3: %{forgeurl}/pull/1401.patch#/unbound-1.25-tls-crypto-policy-default.patch +Patch1: unbound-fedora-config.patch BuildRequires: gcc BuildRequires: make @@ -77,6 +73,7 @@ BuildRequires: openssl-devel BuildRequires: libevent-devel BuildRequires: expat-devel BuildRequires: pkgconfig +BuildRequires: gzip %if 0%{?fedora} || 0%{?rhel} >= 10 BuildRequires: gnupg2 %endif @@ -271,6 +268,7 @@ pushd %{dir_secondary} popd %endif +gzip --best -k doc/Changelog %install install -p -m 0644 %{SOURCE16} . @@ -321,6 +319,8 @@ install -p -m 0644 %{SOURCE27} %{buildroot}%{_tmpfilesdir}/unbound-libs.conf # install root - we keep a copy of the root key in old location, # in case user has changed the configuration and we wouldn't update it there install -p -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/unbound/ +# Creates duplicate copy of the same file to improve backward compatibility +install -p -m 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/unbound/dnssec-root.key install -p -m 0644 %{SOURCE13} %{buildroot}%{_sharedstatedir}/unbound/root.key # local root zone fetch to separated configuration file @@ -422,6 +422,7 @@ popd %files %doc doc/CREDITS doc/FEATURES +%doc doc/Changelog.* %{_unitdir}/%{name}.service %{_unitdir}/%{name}-keygen.service %attr(0775,unbound,root) %dir %{_rundir}/%{name} @@ -499,6 +500,7 @@ popd %{_unitdir}/unbound-anchor.service %dir %attr(0755,unbound,unbound) %{_sharedstatedir}/%{name} %attr(0644,unbound,unbound) %verify(not md5 mtime size) %config %{_sharedstatedir}/%{name}/root.key +%attr(0644,root,root) %config %{_sysconfdir}/%{name}/dnssec-root.key # just left for backwards compat with user changed unbound.conf files - format is different! %attr(0644,root,root) %config %{_sysconfdir}/%{name}/root.key @@ -506,6 +508,13 @@ popd %{_prefix}/lib/dracut/modules.d/99unbound %changelog +* Thu Jul 02 2026 Fedor Vorobev - 1.25.1-1 +- Update to 1.25.1 (RHEL-187020) +- Fixes 11 CVEs: 6 Important, 5 Moderate. + +* Wed Feb 25 2026 Petr Menšík - 1.24.2-3 +- Install correct trust anchor source in Image Mode (RHEL-127540) + * Mon Feb 09 2026 Petr Menšík - 1.24.2-2 - Switch TLS configuration to follow TLS sockets by crypto-policy again (RHEL-147860)