- ignore test failures for the unsupported ciphers

diff --git a/openvpn.spec b/openvpn.spec
index 9e39fca48a6470b2f103c0044ef4e6048e700ae3..3e69850ed51582ac04afbdefa5939fa626b54c2b 100644 (file)
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -21,6 +21,7 @@ Source5:      %{name}.target
 Source6:       %{name}@.service
 Source7:       %{name}-update-resolv-conf
 Patch0:                %{name}-pam.patch
+Patch1:                unsupported-ciphers.patch
 Patch100:      0038-Deprecate-ecdh-curve-with-OpenSSL-3.0-and-adjust-mbe.patch
 Patch101:      0039-Use-EVP_PKEY-based-API-for-loading-DH-keys.patch
 Patch102:      0040-Remove-DES-check-with-OpenSSL-3.0.patch
@@ -156,6 +157,7 @@ Ten pakiet zawiera pliki nagłówkowe do tworzenia wtyczek OpenVPN.
 %patch106 -p1
 %patch107 -p1
 %patch0 -p1
+%patch1 -p1
 
 sed -e 's,/''usr/lib/openvpn,%{_libdir}/%{name},' %{SOURCE7} > contrib/update-resolv-conf
 

diff --git a/unsupported-ciphers.patch b/unsupported-ciphers.patch
new file mode 100644 (file)
index 0000000..ea25804
--- /dev/null
+++ b/unsupported-ciphers.patch
@@ -0,0 +1,11 @@
+--- openvpn-2.5.4/tests/t_lpback.sh~   2021-10-05 07:56:26.000000000 +0200
++++ openvpn-2.5.4/tests/t_lpback.sh    2021-10-29 15:02:09.952131872 +0200
+@@ -46,7 +46,7 @@
+ do
+     printf "Testing cipher ${cipher}... "
+     ( "${top_builddir}/src/openvpn/openvpn" --test-crypto --secret key.$$ --cipher ${cipher} ) >log.$$ 2>&1
+-    if [ $? != 0 ] ; then
++    if [ $? != 0 ] && ! grep "OpenSSL: error:0308010C:digital envelope routines::unsupported" log.$$; then
+         echo "FAILED"
+         cat log.$$
+         e=1