From 858f0f94aff1a0629b63270ecdc2b9246901effd Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 22 Jan 2024 15:19:13 +0900 Subject: [PATCH] Skip KTLS test exercising ChaCha20-Poly1305 in TLS 1.3 as well Resolves: RHEL-18498 Signed-off-by: Daiki Ueno --- ....7.8-ktls_skip_tls12_chachapoly_test.patch | 20 ++++++++++--------- gnutls.spec | 5 ++++- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/gnutls-3.7.8-ktls_skip_tls12_chachapoly_test.patch b/gnutls-3.7.8-ktls_skip_tls12_chachapoly_test.patch index c3a5ace..301f211 100644 --- a/gnutls-3.7.8-ktls_skip_tls12_chachapoly_test.patch +++ b/gnutls-3.7.8-ktls_skip_tls12_chachapoly_test.patch @@ -1,25 +1,27 @@ -From 18c555b4d2461ad202996398609552b9c4ecd43b Mon Sep 17 00:00:00 2001 +From 7d98e7768f3e4e1f981f76e27338ae7118ee2c39 Mon Sep 17 00:00:00 2001 From: rpm-build -Date: Wed, 22 Nov 2023 15:21:49 +0900 +Date: Mon, 22 Jan 2024 15:17:04 +0900 Subject: [PATCH] gnutls-3.7.8-ktls_skip_tls12_chachapoly_test.patch -Signed-off-by: rpm-build --- - tests/gnutls_ktls.c | 1 - - 1 file changed, 1 deletion(-) + tests/gnutls_ktls.c | 2 -- + 1 file changed, 2 deletions(-) diff --git a/tests/gnutls_ktls.c b/tests/gnutls_ktls.c -index ccbe566..049c888 100644 +index ccbe566..8b8992d 100644 --- a/tests/gnutls_ktls.c +++ b/tests/gnutls_ktls.c -@@ -347,7 +347,6 @@ void doit(void) +@@ -347,10 +347,8 @@ void doit(void) { run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-GCM"); run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-256-GCM"); - run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+CHACHA20-POLY1305"); run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-128-GCM"); run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-256-GCM"); - run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+CHACHA20-POLY1305"); +- run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+CHACHA20-POLY1305"); + #if defined(__linux__) + run("NORMAL:-VERS-ALL:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-CCM"); + run("NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+AES-128-CCM"); -- -2.41.0 +2.43.0 diff --git a/gnutls.spec b/gnutls.spec index 6d11f5f..8780dd5 100644 --- a/gnutls.spec +++ b/gnutls.spec @@ -13,7 +13,7 @@ print(string.sub(hash, 0, 16)) } Version: 3.8.2 -Release: 2%{?dist} +Release: 3%{?dist} # not upstreamed Patch: gnutls-3.2.7-rpath.patch Patch: gnutls-3.7.2-enable-intel-cet.patch @@ -410,6 +410,9 @@ make check %{?_smp_mflags} GNUTLS_SYSTEM_PRIORITY_FILE=/dev/null XFAIL_TESTS="$x %endif %changelog +* Mon Jan 22 2024 Daiki Ueno - 3.8.2-3 +- Skip KTLS test exercising ChaCha20-Poly1305 in TLS 1.3 as well (RHEL-18498) + * Fri Dec 8 2023 Daiki Ueno - 3.8.2-2 - Bump nettle dependency to 3.9.1 - Skip KTLS test exercising ChaCha20-Poly1305 in TLS 1.2 (RHEL-18498)