Enable KTLS, temporary disable KTLS tests

Related: RHEL-47335
This commit is contained in:
Dmitry Belyavskiy 2024-08-14 13:02:00 +02:00
parent e6422e7346
commit 83382cc2a0
2 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,16 @@
diff -up openssl-3.2.1/test/sslapitest.c.xxx openssl-3.2.1/test/sslapitest.c
--- openssl-3.2.1/test/sslapitest.c.xxx 2024-04-15 10:14:47.292448045 +0200
+++ openssl-3.2.1/test/sslapitest.c 2024-04-15 10:15:23.428396994 +0200
@@ -1020,9 +1020,10 @@ static int execute_test_large_message(co
/* sock must be connected */
static int ktls_chk_platform(int sock)
{
- if (!ktls_enable(sock))
+/* if (!ktls_enable(sock))
return 0;
- return 1;
+ return 1; */
+ return 0;
}
static int ping_pong_query(SSL *clientssl, SSL *serverssl)

View File

@ -156,6 +156,8 @@ Patch116: 0116-version-aliasing.patch
Patch117: 0117-ignore-unknown-sigalgorithms-groups.patch Patch117: 0117-ignore-unknown-sigalgorithms-groups.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=2160797 # https://bugzilla.redhat.com/show_bug.cgi?id=2160797
Patch121: 0121-FIPS-cms-defaults.patch Patch121: 0121-FIPS-cms-defaults.patch
# skip KTLS tests on infrastructure
Patch122: 0122-TMP-KTLS-test-skip.patch
# HKDF regression with older provider implementations # HKDF regression with older provider implementations
Patch123: 0123-kdf-Preserve-backward-compatibility-with-older-provi.patch Patch123: 0123-kdf-Preserve-backward-compatibility-with-older-provi.patch
# https://github.com/openssl/openssl/issues/24577 # https://github.com/openssl/openssl/issues/24577
@ -284,7 +286,7 @@ sslflags=enable-ec_nistp_64_gcc_128
sslarch=linux-generic64 sslarch=linux-generic64
%endif %endif
#temporarily disable ktls to unblock c10s builds #temporarily disable ktls to unblock c10s builds
ktlsopt=disable-ktls ktlsopt=enable-ktls
%ifarch armv7hl %ifarch armv7hl
ktlsopt=disable-ktls ktlsopt=disable-ktls
%endif %endif
@ -516,6 +518,8 @@ ln -s /etc/crypto-policies/back-ends/openssl_fips.config $RPM_BUILD_ROOT%{_sysco
Resolves: RHEL-54156 Resolves: RHEL-54156
- Fix typo in the patch numeration - Fix typo in the patch numeration
Related: RHEL-41261 Related: RHEL-41261
- Enable KTLS, temporary disable KTLS tests
Related: RHEL-47335
* Fri Aug 09 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.2.2-9 * Fri Aug 09 2024 Dmitry Belyavskiy <dbelyavs@redhat.com> - 1:3.2.2-9
- An interface to create PKCS #12 files in FIPS compliant way - An interface to create PKCS #12 files in FIPS compliant way