diff mbox series

[ovs-dev] tests: Fix "SSL db: implementation" test with openssl > 3.2.0.

Message ID 5418135be178dfa3a459468196dca74aa4bfb95e.1709664951.git.tredaelli@redhat.com
State Accepted
Commit d2a42f396338210ff7382fc3be9e6306d627db96
Delegated to: Ilya Maximets
Headers show
Series [ovs-dev] tests: Fix "SSL db: implementation" test with openssl > 3.2.0. | expand

Checks

Context Check Description
ovsrobot/apply-robot warning apply and check: warning
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/intel-ovs-compilation success test: success

Commit Message

Timothy Redaelli March 5, 2024, 6:55 p.m. UTC
In OpenSSL 3.2.0 (81b741f) all the "alert" error messages was updated to
replace "sslv3" with "ssl/tls".

This commit updates the "SSL db: implementation" test to support both the
pre-openssl 3.2.0 error message: "sslv3 alert certificate unknown" and the
post-openssl 3.2.0 error message: "ssl/tls alert certificate unknown".

Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
---
 tests/ovsdb-server.at | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Eelco Chaudron March 8, 2024, 10:37 a.m. UTC | #1
On 5 Mar 2024, at 19:55, Timothy Redaelli wrote:

> In OpenSSL 3.2.0 (81b741f) all the "alert" error messages was updated to

was -> were

> replace "sslv3" with "ssl/tls".
>
> This commit updates the "SSL db: implementation" test to support both the
> pre-openssl 3.2.0 error message: "sslv3 alert certificate unknown" and the
> post-openssl 3.2.0 error message: "ssl/tls alert certificate unknown".
>
> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
> ---

Other than the small grammer correction this patch look good to me. So assuming the change is applied on commit;

Acked-by: Eelco Chaudron <echaudro@redhat.com>

>  tests/ovsdb-server.at | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
> index b8ccc4c8e..35447a52e 100644
> --- a/tests/ovsdb-server.at
> +++ b/tests/ovsdb-server.at
> @@ -936,8 +936,10 @@ AT_CHECK_UNQUOTED(
>    [ignore])
>  # The error message for being unable to negotiate a shared ciphersuite
>  # is 'sslv3 alert handshake failure'. This is not the clearest message.
> +# In openssl 3.2.0 all the error messages was updated to replace "sslv3" with

was -> were

> +# "ssl/tls".
>  AT_CHECK_UNQUOTED(
> -  [grep "sslv3 alert handshake failure" output], [0],
> +  [grep -E "(sslv3|ssl/tls) alert handshake failure" output], [0],
>    [stdout],
>    [ignore])
>  OVSDB_SERVER_SHUTDOWN(["
> -- 
> 2.43.2
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Ilya Maximets March 8, 2024, 9:23 p.m. UTC | #2
On 3/8/24 11:37, Eelco Chaudron wrote:
> 
> 
> On 5 Mar 2024, at 19:55, Timothy Redaelli wrote:
> 
>> In OpenSSL 3.2.0 (81b741f) all the "alert" error messages was updated to
> 
> was -> were
> 
>> replace "sslv3" with "ssl/tls".
>>
>> This commit updates the "SSL db: implementation" test to support both the
>> pre-openssl 3.2.0 error message: "sslv3 alert certificate unknown" and the
>> post-openssl 3.2.0 error message: "ssl/tls alert certificate unknown".
>>
>> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
>> ---
> 
> Other than the small grammer correction this patch look good to me. So assuming the change is applied on commit;
> 
> Acked-by: Eelco Chaudron <echaudro@redhat.com>


Thanks, Timothy and Eelco!

I fixed the issues and applied the patch to all branches down to 2.17.

Best regards, Ilya Maximets.
diff mbox series

Patch

diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index b8ccc4c8e..35447a52e 100644
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -936,8 +936,10 @@  AT_CHECK_UNQUOTED(
   [ignore])
 # The error message for being unable to negotiate a shared ciphersuite
 # is 'sslv3 alert handshake failure'. This is not the clearest message.
+# In openssl 3.2.0 all the error messages was updated to replace "sslv3" with
+# "ssl/tls".
 AT_CHECK_UNQUOTED(
-  [grep "sslv3 alert handshake failure" output], [0],
+  [grep -E "(sslv3|ssl/tls) alert handshake failure" output], [0],
   [stdout],
   [ignore])
 OVSDB_SERVER_SHUTDOWN(["