Skip to content

Ingela/eqc test cuddling #10287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 20, 2025
Merged

Ingela/eqc test cuddling #10287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad412f6
ssl: oneof -> elements due to static list of elements
IngelaAndin Oct 14, 2025
283166e
ssl: Reduce code duplication
IngelaAndin Oct 16, 2025
fb612b6
ssl: Reduce code length
IngelaAndin Oct 16, 2025
b9b2135
ssl: Use common test include file
IngelaAndin Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
164 changes: 40 additions & 124 deletions lib/ssl/test/property_test/ssl_eqc_chain.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,135 +25,51 @@

%%-export([prop_tls_orded_path/1]).
-compile(export_all).

-proptest(eqc).
-proptest([triq,proper]).

-ifndef(EQC).
-ifndef(PROPER).
-ifndef(TRIQ).
-define(EQC,true).
-endif.
-endif.
-endif.

-ifdef(EQC).
-include_lib("eqc/include/eqc.hrl").
-define(MOD_eqc,eqc).

-else.
-ifdef(PROPER).
-include_lib("proper/include/proper.hrl").
-define(MOD_eqc,proper).

-else.
-ifdef(TRIQ).
-define(MOD_eqc,triq).
-include_lib("triq/include/triq.hrl").

-endif.
-endif.
-endif.

-include_lib("common_test/include/ct_property_test.hrl").
-include_lib("public_key/include/public_key.hrl").
%%--------------------------------------------------------------------
%% Properties --------------------------------------------------------
%%--------------------------------------------------------------------

signature_algs_test(ClientOptions, ServerOptions) ->
try
[TLSVersion] = proplists:get_value(versions, ClientOptions),
SigAlgs = signature_algs(TLSVersion),
ssl_test_lib:basic_test(SigAlgs ++ ClientOptions,
SigAlgs ++ ServerOptions, [{server_type, erlang},
{client_type, erlang},
{version, TLSVersion}
]),

true
catch _:_ ->
false
end.

prop_tls_unordered_path(PrivDir) ->
?FORALL({ClientOptions, ServerOptions}, ?LET(Version, tls_version(), unordered_options(Version, PrivDir)),
try
[TLSVersion] = proplists:get_value(versions, ClientOptions),
SigAlgs = signature_algs(TLSVersion),
ssl_test_lib:basic_test(SigAlgs ++ ClientOptions,
SigAlgs ++ ServerOptions, [{server_type, erlang},
{client_type, erlang},
{version, TLSVersion}
])
of
_ ->
true
catch
_:_ ->
false
end
).
?FORALL({ClientOptions, ServerOptions},
?LET(Version, tls_version(), unordered_options(Version, PrivDir)),
signature_algs_test(ClientOptions, ServerOptions)).

prop_tls_extraneous_path(PrivDir) ->
?FORALL({ClientOptions, ServerOptions}, ?LET(Version, tls_version(), extraneous_options(Version, PrivDir)),
try
[TLSVersion] = proplists:get_value(versions, ClientOptions),
SigAlgs = signature_algs(TLSVersion),
ssl_test_lib:basic_test(SigAlgs ++ ClientOptions,
SigAlgs ++ ServerOptions, [{server_type, erlang},
{client_type, erlang},
{version, TLSVersion}
])
of
_ ->
true
catch
_:_ ->
false
end
).
?FORALL({ClientOptions, ServerOptions},
?LET(Version, tls_version(), extraneous_options(Version, PrivDir)),
signature_algs_test(ClientOptions, ServerOptions)).

prop_tls_extraneous_paths() ->
?FORALL({ClientOptions, ServerOptions}, ?LET(Version, tls_version(), extra_extraneous_options(Version)),
try
[TLSVersion] = proplists:get_value(versions, ClientOptions),
SigAlgs = signature_algs(TLSVersion),
ssl_test_lib:basic_test(SigAlgs ++ ClientOptions,
SigAlgs ++ ServerOptions, [{server_type, erlang},
{client_type, erlang},
{version, TLSVersion}
])
of
_ ->
true
catch
_:_ ->
false
end
).
?FORALL({ClientOptions, ServerOptions},
?LET(Version, tls_version(), extra_extraneous_options(Version)),
signature_algs_test(ClientOptions, ServerOptions)).

prop_tls_extraneous_and_unordered_path() ->
?FORALL({ClientOptions, ServerOptions}, ?LET(Version, tls_version(), unordered_extraneous_options(Version)),
try
[TLSVersion] = proplists:get_value(versions, ClientOptions),
SigAlgs = signature_algs(TLSVersion),
ssl_test_lib:basic_test(SigAlgs ++ ClientOptions,
SigAlgs ++ ServerOptions, [{server_type, erlang},
{client_type, erlang},
{version, TLSVersion}
])
of
_ ->
true
catch
_:_ ->
false
end
).
?FORALL({ClientOptions, ServerOptions},
?LET(Version, tls_version(), unordered_extraneous_options(Version)),
signature_algs_test(ClientOptions, ServerOptions)).

prop_client_cert_auth() ->
?FORALL({ClientOptions, ServerOptions}, ?LET(Version, tls_version(), client_cert_auth_opts(Version)),
try
[TLSVersion] = proplists:get_value(versions, ClientOptions),
SigAlgs = signature_algs(TLSVersion),
ssl_test_lib:basic_test(SigAlgs ++ ClientOptions,
SigAlgs ++ ServerOptions,
[{server_type, erlang},
{client_type, erlang},
{version, TLSVersion}
])
of
_ ->
true
catch
_:_ ->
false
end
).
?FORALL({ClientOptions, ServerOptions},
?LET(Version, tls_version(), client_cert_auth_opts(Version)),
signature_algs_test(ClientOptions, ServerOptions)).

%%--------------------------------------------------------------------
%% Chain Generators -----------------------------------------------
Expand All @@ -162,14 +78,14 @@ tls_version() ->
Versions = [Version || Version <- ['tlsv1.3', 'tlsv1.2', 'tlsv1.1', 'tlsv1', 'dtlsv1.2', 'dtlsv1'],
ssl_test_lib:sufficient_crypto_support(Version)
],
oneof(Versions).
elements(Versions).

key_alg(Version) when Version == 'tlsv1.3';
Version == 'tlsv1.2';
Version == 'dtlsv1.2'->
oneof([rsa, ecdsa]);
elements([rsa, ecdsa]);
key_alg(_) ->
oneof([rsa]).
elements([rsa]).

server_options('tlsv1.3') ->
[{verify, verify_peer},
Expand All @@ -196,11 +112,11 @@ pem_unordered_options(Version, PrivDir) ->
unordered_der_cert_chain_opts(Version, Alg) ->
#{server_config := ServerConf,
client_config := ClientConf} = public_key:pkix_test_data(#{server_chain => #{root => root_key(Alg),
intermediates => intermediates(Alg, 4),
peer => peer_key(Alg)},
client_chain => #{root => root_key(Alg),
intermediates => intermediates(Alg, 4),
peer => peer_key(Alg)}}),
intermediates => intermediates(Alg, 4),
peer => peer_key(Alg)},
client_chain => #{root => root_key(Alg),
intermediates => intermediates(Alg, 4),
peer => peer_key(Alg)}}),
{client_options(Version) ++ [protocol(Version), {versions, [Version]} | unordered_der_conf(ClientConf)],
server_options(Version) ++ [protocol(Version), {versions, [Version]} | unordered_der_conf(ServerConf)]}.

Expand Down
56 changes: 9 additions & 47 deletions lib/ssl/test/property_test/ssl_eqc_cipher_format.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,35 +25,7 @@

-compile(export_all).

-proptest(eqc).
-proptest([triq,proper]).

-ifndef(EQC).
-ifndef(PROPER).
-ifndef(TRIQ).
-define(EQC,true).
-endif.
-endif.
-endif.

-ifdef(EQC).
-include_lib("eqc/include/eqc.hrl").
-define(MOD_eqc,eqc).

-else.
-ifdef(PROPER).
-include_lib("proper/include/proper.hrl").
-define(MOD_eqc,proper).

-else.
-ifdef(TRIQ).
-define(MOD_eqc,triq).
-include_lib("triq/include/triq.hrl").

-endif.
-endif.
-endif.

-include_lib("common_test/include/ct_property_test.hrl").
-include_lib("public_key/include/public_key.hrl").

-define('TLS_v1.3', 'tlsv1.3').
Expand All @@ -67,13 +39,7 @@

prop_tls_cipher_suite_rfc_name() ->
?FORALL({CipherSuite, _TLSVersion}, ?LET(Version, tls_version(), {cipher_suite(Version), Version}),
case ssl:str_to_suite(ssl:suite_to_str(CipherSuite)) of
CipherSuite ->
true;
_ ->
false
end
).
ssl:str_to_suite(ssl:suite_to_str(CipherSuite)) == CipherSuite).
Copy link

Copilot AI Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Use exact equality (=:=) instead of == to compare terms. This ensures strict structural equality and avoids numeric type coercion.

Copilot uses AI. Check for mistakes.


prop_tls_cipher_suite_openssl_name() ->
?FORALL({CipherSuite, _TLSVersion}, ?LET(Version, tls_version(), {cipher_suite(Version), Version}),
Expand All @@ -91,17 +57,14 @@ prop_tls_cipher_suite_openssl_name() ->
).

prop_tls_anon_cipher_suite_rfc_name() ->
?FORALL({CipherSuite, _TLSVersion}, ?LET(Version, pre_tls_1_3_version(), {anon_cipher_suite(Version), Version}),
case ssl:str_to_suite(ssl:suite_to_str(CipherSuite)) of
CipherSuite ->
true;
_ ->
false
end
).
?FORALL({CipherSuite, _TLSVersion},
?LET(Version, pre_tls_1_3_version(), {anon_cipher_suite(Version), Version}),
ssl:str_to_suite(ssl:suite_to_str(CipherSuite)) == CipherSuite
Copy link

Copilot AI Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] Use =:= instead of == for exact term equality to make the comparison strict and unambiguous.

Suggested change
ssl:str_to_suite(ssl:suite_to_str(CipherSuite)) == CipherSuite
ssl:str_to_suite(ssl:suite_to_str(CipherSuite)) =:= CipherSuite

Copilot uses AI. Check for mistakes.

).

prop_tls_anon_cipher_suite_openssl_name() ->
?FORALL({CipherSuite, _TLSVersion}, ?LET(Version, pre_tls_1_3_version(), {anon_cipher_suite(Version), Version}),
?FORALL({CipherSuite, _TLSVersion},
?LET(Version, pre_tls_1_3_version(), {anon_cipher_suite(Version), Version}),
case ssl:str_to_suite(ssl:suite_to_openssl_str(CipherSuite)) of
CipherSuite ->
lists:member(ssl:suite_to_openssl_str(CipherSuite), openssl_legacy_names());
Expand All @@ -112,8 +75,7 @@ prop_tls_anon_cipher_suite_openssl_name() ->

prop_tls_signature_algs() ->
?FORALL(SigAlg, ?LET(SigAlg, sig_alg(), SigAlg),
true = lists:member(ssl_cipher:signature_algorithm_to_scheme(SigAlg), sig_schemes())
).
lists:member(ssl_cipher:signature_algorithm_to_scheme(SigAlg), sig_schemes())).

%%--------------------------------------------------------------------
%% Generators -----------------------------------------------
Expand Down
32 changes: 2 additions & 30 deletions lib/ssl/test/property_test/ssl_eqc_ecc.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,37 +25,9 @@

%%-export([prop_tls_orded_path/1]).
-compile(export_all).

-proptest(eqc).
-proptest([triq,proper]).

-ifndef(EQC).
-ifndef(PROPER).
-ifndef(TRIQ).
-define(EQC,true).
-endif.
-endif.
-endif.

-ifdef(EQC).
-include_lib("eqc/include/eqc.hrl").
-define(MOD_eqc,eqc).

-else.
-ifdef(PROPER).
-include_lib("proper/include/proper.hrl").
-define(MOD_eqc,proper).

-else.
-ifdef(TRIQ).
-define(MOD_eqc,triq).
-include_lib("triq/include/triq.hrl").

-endif.
-endif.
-endif.

-include_lib("common_test/include/ct_property_test.hrl").
-include_lib("public_key/include/public_key.hrl").

%%--------------------------------------------------------------------
%% Properties --------------------------------------------------------
%%--------------------------------------------------------------------
Expand Down
Loading
Loading