[rpms/dnssec-tools] rawhide: Fix build with OpenSSL 4.0

[Dmitry Belyavskiy <beldmit@gmail.com>]

A new commit has been pushed.

Repo   : rpms/dnssec-tools
Branch : rawhide
Commit : 26a98743b9bcb498b648d67249a251eb8f081d9c
Author : Dmitry Belyavskiy <beldmit@gmail.com>
Date   : 2026-04-30T15:15:35+02:00
Stats  : +60/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/dnssec-tools/c/26a98743b9bcb498b648d67249a251eb8f081d9c?branch=rawhide

Log:
Fix build with OpenSSL 4.0

---
diff --git a/dnssec-tools-openssl4.patch b/dnssec-tools-openssl4.patch
new file mode 100644
index 0000000..b20e334
--- /dev/null
+++ b/dnssec-tools-openssl4.patch
@@ -0,0 +1,54 @@
+--- a/validator/libval/val_context.c	2026-04-30 15:00:45.542695525 +0200
++++ b/validator/libval/val_context.c	2026-04-30 15:11:59.428861648 +0200
+@@ -857,9 +857,11 @@
+ #ifndef OPENSSL_NO_ENGINE
+     ENGINE_cleanup(); 
+ #endif
+-    CRYPTO_cleanup_all_ex_data(); 
+-    ERR_remove_state(0); 
+-    ERR_free_strings(); 
++    CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x40000000L
++    ERR_remove_state(0);
++#endif
++    ERR_free_strings();
+ 
+     return VAL_NO_ERROR;
+ }
+--- a/validator/libval/val_dane.c	2026-04-30 15:02:33.844017460 +0200
++++ b/validator/libval/val_dane.c	2026-04-30 15:02:48.179140213 +0200
+@@ -543,10 +543,10 @@
+ 
+     GENERAL_NAMES *saNames = NULL;
+     GENERAL_NAME *cur = NULL;
+-    X509_NAME *subj = NULL;
++    const X509_NAME *subj = NULL;
+     int retval = 1;
+-    ASN1_STRING *astr;
+-    char *cp;
++    const ASN1_STRING *astr;
++    const char *cp;
+ 
+     if (qname == NULL || cert == NULL)
+         return 0;
+@@ -563,7 +563,7 @@
+             cur = sk_GENERAL_NAME_value(saNames, i);
+             if (cur->type == GEN_DNS) {
+                 astr = cur->d.dNSName;
+-                cp = (char *)astr->data;
++                cp = (const char *)ASN1_STRING_get0_data(astr);
+ 
+                 /* check for exact match or wildcard match */
+                 if (cp &&
+@@ -585,9 +585,9 @@
+     subj = X509_get_subject_name(cert);
+     i = -1;
+     while ((i = X509_NAME_get_index_by_NID(subj, NID_commonName, i)) >=0) {
+-        X509_NAME_ENTRY *entry = X509_NAME_get_entry(subj, i);
++        const X509_NAME_ENTRY *entry = X509_NAME_get_entry(subj, i);
+         astr = X509_NAME_ENTRY_get_data(entry);
+-        cp = (char *)astr->data;
++        cp = (const char *)ASN1_STRING_get0_data(astr);
+ 
+         /* check for exact match or wildcard match */
+         if (cp &&

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 2343753..4eb0f0f 100644
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -8,7 +8,7 @@
 Summary: A suite of tools for managing dnssec aware DNS usage
 Name: dnssec-tools
 Version: 2.2.3
-Release: 32%{?dist}
+Release: 33%{?dist}
 # Automatically converted from old format: BSD - review is highly recommended.
 License: LicenseRef-Callaway-BSD
 URL: http://www.dnssec-tools.org/
@@ -38,6 +38,7 @@ Patch19: 7287c6b96422e499560fb10b95c1a481ea82656d.patch
 # link libval-threads with libs
 Patch20: dnssec-tools-2.2.3-link-libval-threads-with-libs.patch
 Patch21: dnssec-tools-2.2.3-add_ifdedf_to_engine.patch
+Patch22: dnssec-tools-openssl4.patch
 
 %description
 
@@ -84,6 +85,7 @@ C-based libraries useful for developing dnssec aware tools.
 %patch -P19 -p2
 %patch -P20 -p1 -b .link-with-libs
 %patch -P21 -p1
+%patch -P22 -p1
 
 %build
 %configure --with-validator-testcases-file=%{_datadir}/dnssec-tools/validator-testcases --with-perl-build-args="INSTALLDIRS=vendor OPTIMIZE='$RPM_OPT_FLAGS'" --sysconfdir=/etc --with-root-hints=/etc/dnssec-tools/root.hints --with-resolv-conf=/etc/dnssec-tools/resolv.conf --disable-static --with-nsec3 --with-ipv6 --with-dlv --disable-bind-checks
@@ -372,6 +374,9 @@ install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}/%{_bindir}/libval-config
 
 
 %changelog
+* Thu Apr 30 2026 Dmitry Belyavskiy <beldmit@gmail.com> - 2.2.3-33
+- Fix build with OpenSSL 4.0 (remove deprecated cleanup functions)
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.3-32
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild