File 0657-ssl-Fix-type-specs-of-internal-handshake-f... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0657-ssl-Fix-type-specs-of-internal-handshake-functions.patch of Package erlang (Revision 1df3ed72f7aa9edd3e18418a69795124)

Currently displaying revision 1df3ed72f7aa9edd3e18418a69795124 , Show latest

From 4223e999df9d0ef75e3ad4773f94d0c00d34bcc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Dimitrov?= <peterdmv@erlang.org>
Date: Thu, 18 Apr 2019 14:45:28 +0200
Subject: [PATCH 08/13] ssl: Fix type specs of internal handshake functions

Change-Id: I99cd0bebd80b3e55fd522457fa126e5bc198657b

Conflicts:
	lib/ssl/src/ssl_handshake.erl
---
 lib/ssl/src/ssl_handshake.erl | 4 ++--
 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
@@ -142,7 +142,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
-- 
2.16.4

Places

File 0657-ssl-Fix-type-specs-of-internal-handshake-functions.patch of Package erlang (Revision 1df3ed72f7aa9edd3e18418a69795124)

Places