diff options
| author | Hans Bolinder <[email protected]> | 2018-03-13 10:26:02 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-03-13 10:26:02 +0100 |
| commit | 54e20b0df9e643f48bcc4bcb8d58bdc97335b42b (patch) | |
| tree | e4bbb6795745163e7a0ca0277793dc1e4258710d /lib/ssl/src/ssl_handshake.erl | |
| parent | 3fa85a8e858e1c8300967e0eda347697c0940188 (diff) | |
| parent | b4d1aa182b211083c2982a700aa3e35eddecb6fc (diff) | |
| download | otp-54e20b0df9e643f48bcc4bcb8d58bdc97335b42b.tar.gz otp-54e20b0df9e643f48bcc4bcb8d58bdc97335b42b.tar.bz2 otp-54e20b0df9e643f48bcc4bcb8d58bdc97335b42b.zip | |
Merge branch 'hasse/dialyzer/extra-range/OTP-14970'
* hasse/dialyzer/extra-range/OTP-14970:
ssl: Correct some specs
os_mon: Correct a spec
Fix broken spec in beam_asm
Dialyzer should not throw away spec information because of overspec
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 09160e2f9c..9e2b12b186 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -189,12 +189,18 @@ certificate_request(CipherSuite, CertDbHandle, CertDbRef, HashSigns, Version) -> {dh, binary()} | {dh, {binary(), binary()}, #'DHParameter'{}, {HashAlgo::atom(), SignAlgo::atom()}, binary(), binary(), public_key:private_key()} | + {ecdh, _, _, _, _, _} | {ecdh, #'ECPrivateKey'{}} | + {psk, _, _, _, _, _} | {psk, binary()} | + {dhe_psk, _, _, _, _, _, _, _} | {dhe_psk, binary(), binary()} | + {ecdhe_psk, _, _, _, _, _, _} | {ecdhe_psk, binary(), #'ECPrivateKey'{}} | {srp, {binary(), binary()}, #srp_user{}, {HashAlgo::atom(), SignAlgo::atom()}, - binary(), binary(), public_key:private_key()}) -> + binary(), binary(), public_key:private_key()} | + {srp, _} | + {psk_premaster_secret, _, _, _}) -> #client_key_exchange{} | #server_key_exchange{}. %% |