Skip to content

ssl: For TLS-1.2 cert signature must be compatible with cipher suite. #10247

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

Open
wants to merge 1 commit into
base: maint
Choose a base branch
from
+32 −14
Open

ssl: For TLS-1.2 cert signature must be compatible with cipher suite. #10247

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 32 additions & 14 deletions lib/ssl/src/ssl_handshake.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,38 +1146,56 @@ server_select_cert_key_pair_and_params(CipherSuites, [#{private_key := NoKey, ce
CipherSuite0 = select_cipher_suite(CipherSuites, Suites, HonorCipherOrder),
CurveAndSuite = cert_curve(undefined, ECCCurve0, CipherSuite0),
{NoCerts, NoKey, CurveAndSuite};
server_select_cert_key_pair_and_params(CipherSuites, [#{private_key := Key, certs := [Cert | _] = Certs}], HashSigns, ECCCurve0,
server_select_cert_key_pair_and_params(CipherSuites0, [#{private_key := Key, certs := [Cert | _] = Certs}], HashSigns, ECCCurve0,
#{ciphers := UserSuites, honor_cipher_order := HonorCipherOrder}, Version) ->
Suites = available_suites(Cert, UserSuites, Version, HashSigns, ECCCurve0),
CipherSuites = [ Suite || Suite <- CipherSuites0,
is_acceptable_cert(Suite, Cert, HashSigns, ssl:tls_version(Version))],
CipherSuite0 = select_cipher_suite(CipherSuites, Suites, HonorCipherOrder),
CurveAndSuite = cert_curve(Cert, ECCCurve0, CipherSuite0),
{Certs, Key, CurveAndSuite};
server_select_cert_key_pair_and_params(CipherSuites, [#{private_key := Key, certs := [Cert | _] = Certs} | Rest], HashSigns, ECCCurve0,
server_select_cert_key_pair_and_params(CipherSuites0, [#{private_key := Key, certs := [Cert | _] = Certs} | Rest], HashSigns, ECCCurve0,
#{ciphers := UserSuites, honor_cipher_order := HonorCipherOrder} = Opts, Version) ->
Suites = available_suites(Cert, UserSuites, Version, HashSigns, ECCCurve0),
CipherSuites = [ Suite || Suite <- CipherSuites0, is_acceptable_cert(Suite, Cert, HashSigns, ssl:tls_version(Version))],
case select_cipher_suite(CipherSuites, Suites, HonorCipherOrder) of
no_suite ->
server_select_cert_key_pair_and_params(CipherSuites, Rest, HashSigns, ECCCurve0, Opts, Version);
server_select_cert_key_pair_and_params(CipherSuites0, Rest, HashSigns, ECCCurve0, Opts, Version);
CipherSuite0 ->
case is_acceptable_cert(Cert, HashSigns, ssl:tls_version(Version)) of
true ->
CurveAndSuite = cert_curve(Cert, ECCCurve0, CipherSuite0),
{Certs, Key, CurveAndSuite};
false ->
server_select_cert_key_pair_and_params(CipherSuites, Rest, HashSigns, ECCCurve0, Opts, Version)
end
end.
CurveAndSuite = cert_curve(Cert, ECCCurve0, CipherSuite0),
{Certs, Key, CurveAndSuite};
end.

is_acceptable_cert(Cert, HashSigns, Version)
is_acceptable_cert(CipherSuite, Cert, HashSigns, Version)
when ?TLS_1_X(Version),
?TLS_GTE(Version, ?TLS_1_2) ->
{SignAlgo0, Param, _, _, _} = get_cert_params(Cert),
SignAlgo = sign_algo(SignAlgo0, Param),
is_acceptable_hash_sign(SignAlgo, HashSigns);
is_acceptable_cert(_,_,_) ->
is_acceptable_hash_sign(SignAlgo, acceptable_hash_signs(CipherSuite, HashSigns));
is_acceptable_cert(_, _,_,_) ->
%% Not negotiable pre TLS-1.2. So if cert is available for version it is acceptable
true.

acceptable_hash_signs(CipherSuite, HashSigns) ->
#{key_exchange := Kex} = ssl_cipher_format:suite_bin_to_map(CipherSuite),
Filter = fun({_, rsa}) when Kex == ecdh_rsa;
Kex == dhe_rsa;
Kex == srp_rsa;
Kex == rsa ->
true;
({_, ecdsa}) when Kex == ecdh_ecdsa;
Kex == ecdhe_ecdsa ->
true;
({_, dsa}) when Kex == dhe_dss;
Kex == srp_dss ->
true;
(_) when Kex == any ->
true;
(_) ->
false
end,
[HS || HS <- HashSigns, Filter(HS)].

premaster_secret(OtherPublicDhKey, MyPrivateKey, #'DHParameter'{} = Params) ->
try
public_key:compute_key(OtherPublicDhKey, MyPrivateKey, Params)
Expand Down
Loading