diff options
| author | Hans Nilsson <[email protected]> | 2014-01-28 15:09:35 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-01-28 15:09:35 +0100 |
| commit | dc7eeae35b5a9e23a08584605e71c4007dfd74ee (patch) | |
| tree | b5db58006d3c7f676105310074d7961e8952b127 /lib/ssl/src/ssl_handshake.erl | |
| parent | 6de916efa8df952ca1e24cccda673134982c0da0 (diff) | |
| parent | 9ec3ad0d292a5b89a332cb24ed2246a3bfdf9443 (diff) | |
| download | otp-dc7eeae35b5a9e23a08584605e71c4007dfd74ee.tar.gz otp-dc7eeae35b5a9e23a08584605e71c4007dfd74ee.tar.bz2 otp-dc7eeae35b5a9e23a08584605e71c4007dfd74ee.zip | |
Merge branch 'master' of super:otp
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 487dfc01d9..7b4cf8eb06 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -164,7 +164,7 @@ next_protocol(SelectedProtocol) -> %%-------------------------------------------------------------------- -spec client_certificate_verify(undefined | der_cert(), binary(), - tls_version(), term(), private_key(), + tls_version(), term(), public_key:private_key(), tls_handshake_history()) -> #certificate_verify{} | ignore | #alert{}. %% @@ -207,12 +207,12 @@ certificate_request(CipherSuite, CertDbHandle, CertDbRef, Version) -> {premaster_secret, binary(), public_key_info()} | {dh, binary()} | {dh, {binary(), binary()}, #'DHParameter'{}, {HashAlgo::atom(), SignAlgo::atom()}, - binary(), binary(), private_key()} | + binary(), binary(), public_key:private_key()} | {ecdh, #'ECPrivateKey'{}} | {psk, binary()} | {dhe_psk, binary(), binary()} | {srp, {binary(), binary()}, #srp_user{}, {HashAlgo::atom(), SignAlgo::atom()}, - binary(), binary(), private_key()}) -> + binary(), binary(), public_key:private_key()}) -> #client_key_exchange{} | #server_key_exchange{}. %% |