File 3761-ssl-Correct-test.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3761-ssl-Correct-test.patch of Package erlang (Revision cedef37c232ae7facdde1acac128f30e)

Currently displaying revision cedef37c232ae7facdde1acac128f30e , Show latest

From 36ed0eab769f6b350ebdca808f6178726b0485f0 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Wed, 14 Sep 2022 15:23:40 +0200
Subject: [PATCH] ssl: Correct test

---
 lib/ssl/test/openssl_alpn_SUITE.erl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ssl/test/openssl_alpn_SUITE.erl b/lib/ssl/test/openssl_alpn_SUITE.erl
index c64a7a3e87..ff1afcb05f 100644
--- a/lib/ssl/test/openssl_alpn_SUITE.erl
+++ b/lib/ssl/test/openssl_alpn_SUITE.erl
@@ -121,9 +121,9 @@ init_per_suite(Config0) ->
             {skip, "Openssl not found"};
         _ ->
             case check_openssl_alpn_support(Config0) of
-                {skip, _} = Skip ->
-                    Skip;
-                _ ->
+                false ->
+                    {skip, "No ALPN support"};
+                true ->
                     ct:pal("Version: ~p", [os:cmd("openssl version")]),
                     catch crypto:stop(),
                     try crypto:start() of
@@ -478,11 +478,11 @@ check_openssl_alpn_support(_Config) ->
     case ssl_test_lib:portable_cmd("openssl", ["version"]) of
         "OpenSSL 1.0."  ++ _ = Str->
             SubStr = Str -- "OpenSSL 1.0.",
-            atleast(SubStr, 2) andalso (not ssl_test_lib:is_fips(openssl));
+            atleast(SubStr, 2);
         "OpenSSL 1.1" ++ _ ->
-            not ssl_test_lib:is_fips(openssl);
+            true;
         "OpenSSL 3" ++ _ ->
-            not ssl_test_lib:is_fips(openssl);
+            true;
         "LibreSSL 2.0" ++ _ ->
             false;
         "LibreSSL 2.1." ++ _ = Str ->
-- 
2.35.3

Places

File 3761-ssl-Correct-test.patch of Package erlang (Revision cedef37c232ae7facdde1acac128f30e)

Places