diff options
| author | Ingela Anderton Andin <[email protected]> | 2018-09-07 09:52:59 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2018-09-07 09:52:59 +0200 |
| commit | 8017f8298db96f05ececb1790f926afc003c565d (patch) | |
| tree | 2b11029180ddb67c7f2fca84bddfb2a1fb165ce8 /lib/ssl/src | |
| parent | 2917410f3e2baa7fdd9c276c91040b42e6d08ec1 (diff) | |
| parent | 5960e81bc4e19d54a3b082840301665ad0e1cd09 (diff) | |
| download | otp-8017f8298db96f05ececb1790f926afc003c565d.tar.gz otp-8017f8298db96f05ececb1790f926afc003c565d.tar.bz2 otp-8017f8298db96f05ececb1790f926afc003c565d.zip | |
Merge branch 'ingela/ssl/property-tests'
* ingela/ssl/property-tests:
ssl: Correct compression decoding
ssl: Add property tests framework
ssl: Fix typo
Diffstat (limited to 'lib/ssl/src')
| -rw-r--r-- | lib/ssl/src/ssl_record.erl | 5 | ||||
| -rw-r--r-- | lib/ssl/src/tls_handshake.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/tls_handshake_1_3.erl | 4 | ||||
| -rw-r--r-- | lib/ssl/src/tls_handshake_1_3.hrl | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/lib/ssl/src/ssl_record.erl b/lib/ssl/src/ssl_record.erl index 659e1485ac..446bb6c56a 100644 --- a/lib/ssl/src/ssl_record.erl +++ b/lib/ssl/src/ssl_record.erl @@ -278,13 +278,12 @@ compress(?NULL, Data, CS) -> {Data, CS}. %%-------------------------------------------------------------------- --spec compressions() -> [binary()]. +-spec compressions() -> [integer()]. %% %% Description: return a list of compressions supported (currently none) %%-------------------------------------------------------------------- compressions() -> - [?byte(?NULL)]. - + [?NULL]. %%==================================================================== %% Payload encryption/decryption diff --git a/lib/ssl/src/tls_handshake.erl b/lib/ssl/src/tls_handshake.erl index 1fccc216cb..82ed2e8d14 100644 --- a/lib/ssl/src/tls_handshake.erl +++ b/lib/ssl/src/tls_handshake.erl @@ -419,7 +419,7 @@ decode_handshake(_Version, ?CLIENT_HELLO, random = Random, session_id = Session_ID, cipher_suites = ssl_handshake:decode_suites('2_bytes', CipherSuites), - compression_methods = Comp_methods, + compression_methods = erlang:binary_to_list(Comp_methods), extensions = DecodedExtensions }; decode_handshake({3, 4}, Tag, Msg) -> diff --git a/lib/ssl/src/tls_handshake_1_3.erl b/lib/ssl/src/tls_handshake_1_3.erl index b4c5f268b8..2957e3a5b4 100644 --- a/lib/ssl/src/tls_handshake_1_3.erl +++ b/lib/ssl/src/tls_handshake_1_3.erl @@ -58,7 +58,7 @@ encode_handshake(#new_session_ticket{ {?NEW_SESSION_TICKET, <<?UINT32(LifeTime), ?UINT32(Age), ?BYTE(Nonce), ?UINT16(TicketSize), Ticket/binary, BinExts/binary>>}; -encode_handshake(#end_of_earyly_data{}) -> +encode_handshake(#end_of_early_data{}) -> {?END_OF_EARLY_DATA, <<>>}; encode_handshake(#key_update{request_update = Update}) -> {?KEY_UPDATE, <<?BYTE(Update)>>}; @@ -103,7 +103,7 @@ decode_handshake(?NEW_SESSION_TICKET, <<?UINT32(LifeTime), ?UINT32(Age), ticket = Ticket, extensions = Exts}; decode_handshake(?END_OF_EARLY_DATA, _) -> - #end_of_earyly_data{}; + #end_of_early_data{}; decode_handshake(?KEY_UPDATE, <<?BYTE(Update)>>) -> #key_update{request_update = Update}; decode_handshake(Tag, HandshakeMsg) -> diff --git a/lib/ssl/src/tls_handshake_1_3.hrl b/lib/ssl/src/tls_handshake_1_3.hrl index b07fa967b5..0ef954e2e9 100644 --- a/lib/ssl/src/tls_handshake_1_3.hrl +++ b/lib/ssl/src/tls_handshake_1_3.hrl @@ -217,7 +217,7 @@ }). %% RFC 8446 B.3.5. Updating Keys --record(end_of_earyly_data, { +-record(end_of_early_data, { }). -define(UPDATE_NOT_REQUESTED, 0). |