diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2022-09-14 15:38:37 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2022-09-14 15:38:37 +0200 |
| commit | 167db044cdd4ed5d44f17422b4be2e408fee7b46 (patch) | |
| tree | b435e1042ab576337ae43198e6fad5c2f88e4e6e | |
| parent | aeff5ba324bc0f5e686bf7a262fedb8872b21fb3 (diff) | |
| parent | 36ed0eab769f6b350ebdca808f6178726b0485f0 (diff) | |
| download | erlang-167db044cdd4ed5d44f17422b4be2e408fee7b46.tar.gz | |
Merge branch 'ingela/ssl/cuddle/openssl_alpn' into maint
* ingela/ssl/cuddle/openssl_alpn:
ssl: Correct test
| -rw-r--r-- | lib/ssl/test/openssl_alpn_SUITE.erl | 12 |
1 files 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 -> |