diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index 05651a3..ea18af4 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -2007,6 +2007,25 @@ index 2fe6c540a..d1d2ae6f2 100644 void smap_replace(struct smap *, const char *, const char *); void smap_replace_nocopy(struct smap *, const char *, char *); +diff --git a/lib/stream-ssl.c b/lib/stream-ssl.c +index 62da9febb..86747e58b 100644 +--- a/lib/stream-ssl.c ++++ b/lib/stream-ssl.c +@@ -1075,7 +1075,13 @@ do_ssl_init(void) + VLOG_ERR("SSL_CTX_new: %s", ERR_error_string(ERR_get_error(), NULL)); + return ENOPROTOOPT; + } +- SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); ++ ++ long options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; ++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF ++ options |= SSL_OP_IGNORE_UNEXPECTED_EOF; ++#endif ++ SSL_CTX_set_options(ctx, options); ++ + #if OPENSSL_VERSION_NUMBER < 0x3000000fL + SSL_CTX_set_tmp_dh_callback(ctx, tmp_dh_callback); + #else diff --git a/lib/tc.c b/lib/tc.c index 4c07e2216..5c32c6f97 100644 --- a/lib/tc.c diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 7ebd8d0..70fd666 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 32%{?dist} +Release: 33%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -757,6 +757,12 @@ exit 0 %endif %changelog +* Fri May 26 2023 Open vSwitch CI - 3.1.0-33 +- Merging upstream branch-3.1 [RH git: ea7b9de7d1] + Commit list: + 55535451bb stream-ssl: Disable alerts on unexpected EOF. + + * Thu May 25 2023 Open vSwitch CI - 3.1.0-32 - Merging upstream branch-3.1 [RH git: 5cf043293a] Commit list: