diff options
| author | Péter Dimitrov <[email protected]> | 2019-06-17 10:09:21 +0200 |
|---|---|---|
| committer | Péter Dimitrov <[email protected]> | 2019-06-17 10:09:21 +0200 |
| commit | 12ffab821bd9144d9f85bc6cbde25412b8912d64 (patch) | |
| tree | fcef6b9f5e455cf4f3c9b20a80f7ed98d08984f2 /lib/ssl/src/ssl_handshake.erl | |
| parent | fdb2f749221c97952f042d9f1094c8a77d010dfe (diff) | |
| parent | 1564864b8e7a6cd247995eb74efa5d9ab7f9ea0f (diff) | |
| download | otp-12ffab821bd9144d9f85bc6cbde25412b8912d64.tar.gz otp-12ffab821bd9144d9f85bc6cbde25412b8912d64.tar.bz2 otp-12ffab821bd9144d9f85bc6cbde25412b8912d64.zip | |
Merge branch 'peterdmv/ssl/tls12-java11-interop/ERL-973/OTP-15887' into maint
* peterdmv/ssl/tls12-java11-interop/ERL-973/OTP-15887:
ssl: Add interop test
ssl: Improve handling of signature algorithms
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 1f0c95701b..bd9407a207 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1194,10 +1194,7 @@ signature_algs_ext(undefined) -> signature_algs_ext(SignatureSchemes0) -> %% The SSL option signature_algs contains both hash-sign algorithms (tuples) and %% signature schemes (atoms) if TLS 1.3 is configured. - %% Filter out all hash-sign tuples when creating the signature_algs extension. - %% (TLS 1.3 specific record type) - SignatureSchemes = lists:filter(fun is_atom/1, SignatureSchemes0), - #signature_algorithms{signature_scheme_list = SignatureSchemes}. + #signature_algorithms{signature_scheme_list = SignatureSchemes0}. signature_algs_cert(undefined) -> undefined; |