diff options
| author | Péter Dimitrov <[email protected]> | 2019-04-18 14:45:28 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-04-30 17:18:04 +0200 |
| commit | 4223e999df9d0ef75e3ad4773f94d0c00d34bcc9 (patch) | |
| tree | 1b1d236917905e3c65b0db58a6c997316a1022ef | |
| parent | 0d160208d41d708fe18325f973fdd8ac849309fc (diff) | |
| download | otp-4223e999df9d0ef75e3ad4773f94d0c00d34bcc9.tar.gz otp-4223e999df9d0ef75e3ad4773f94d0c00d34bcc9.tar.bz2 otp-4223e999df9d0ef75e3ad4773f94d0c00d34bcc9.zip | |
ssl: Fix type specs of internal handshake functions
Change-Id: I99cd0bebd80b3e55fd522457fa126e5bc198657b
Conflicts:
lib/ssl/src/ssl_handshake.erl
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 9ba62b3a12..29db1b07c4 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -92,8 +92,8 @@ hello_request() -> #hello_request{}. %%-------------------------------------------------------------------- --spec server_hello(#session{}, ssl_record:ssl_version(), ssl_record:connection_states(), - #hello_extensions{}) -> #server_hello{}. +-spec server_hello(binary(), ssl_record:ssl_version(), ssl_record:connection_states(), + Extension::map()) -> #server_hello{}. %% %% Description: Creates a server hello message. %%-------------------------------------------------------------------- diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index 0f0de5936a..c2b0d8e039 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -157,7 +157,7 @@ encode_handshake(Package, Version) -> %%-------------------------------------------------------------------- -spec get_tls_handshake(tls_record:tls_version(), binary(), binary() | iolist(), #ssl_options{}) -> - {[tls_handshake()], binary()}. + {[{tls_handshake(), binary()}], binary()}. %% %% Description: Given buffered and new data from ssl_record, collects %% and returns it as a list of handshake messages, also returns leftover |