diff options
| author | Raimo Niskanen <[email protected]> | 2019-01-31 16:26:32 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2019-02-13 14:03:18 +0100 |
| commit | 86c4a2f9da3de486095d029fc0e66a4fa3b66fca (patch) | |
| tree | c76f23b88209ae5a236b3f35ad3c5237994b96f2 /lib | |
| parent | 16cd5922faded9eb25a468a495712b3845bfba35 (diff) | |
| download | otp-86c4a2f9da3de486095d029fc0e66a4fa3b66fca.tar.gz otp-86c4a2f9da3de486095d029fc0e66a4fa3b66fca.tar.bz2 otp-86c4a2f9da3de486095d029fc0e66a4fa3b66fca.zip | |
Try to optimize decode_cipher_text/3
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/tls_record.erl | 48 |
1 files changed, 21 insertions, 27 deletions
diff --git a/lib/ssl/src/tls_record.erl b/lib/ssl/src/tls_record.erl index fcbb4bb48c..ce21e40dd8 100644 --- a/lib/ssl/src/tls_record.erl +++ b/lib/ssl/src/tls_record.erl @@ -155,25 +155,20 @@ encode_data(Frag, Version, %% %% Description: Decode cipher text %%-------------------------------------------------------------------- -decode_cipher_text(#ssl_tls{type = Type, version = Version, - fragment = CipherFragment} = CipherText, +decode_cipher_text(#ssl_tls{type = Type, version = Version} = CipherText, #{current_read := - #{compression_state := CompressionS0, - sequence_number := Seq, - cipher_state := CipherS0, - security_parameters := - #security_parameters{ - cipher_type = ?AEAD, - bulk_cipher_algorithm = - BulkCipherAlgo, - compression_algorithm = CompAlg} + #{sequence_number := Seq, + security_parameters := #security_parameters{cipher_type = ?AEAD} = SecParams } = ReadState0} = ConnnectionStates0, _) -> AAD = start_additional_data(Type, Version, Seq), + #{cipher_state := CipherS0} = ReadState0, + BulkCipherAlgo = SecParams#security_parameters.bulk_cipher_algorithm, CipherS1 = ssl_record:nonce_seed(BulkCipherAlgo, <<?UINT64(Seq)>>, CipherS0), - case ssl_record:decipher_aead(BulkCipherAlgo, CipherS1, AAD, CipherFragment, Version) of + case ssl_record:decipher_aead(BulkCipherAlgo, CipherS1, AAD, CipherText#ssl_tls.fragment, Version) of {PlainFragment, CipherState} -> - {Plain, CompressionS1} = ssl_record:uncompress(CompAlg, - PlainFragment, CompressionS0), + #{compression_state := CompressionS0} = ReadState0, + {Plain, CompressionS1} = ssl_record:uncompress(SecParams#security_parameters.compression_algorithm, + PlainFragment, CompressionS0), ConnnectionStates = ConnnectionStates0#{ current_read => ReadState0#{ cipher_state => CipherState, @@ -184,28 +179,27 @@ decode_cipher_text(#ssl_tls{type = Type, version = Version, Alert end; -decode_cipher_text(#ssl_tls{type = Type, version = Version, +decode_cipher_text(#ssl_tls{version = Version, fragment = CipherFragment} = CipherText, - #{current_read := - #{compression_state := CompressionS0, - sequence_number := Seq, - security_parameters := - #security_parameters{compression_algorithm = CompAlg} - } = ReadState0} = ConnnectionStates0, PaddingCheck) -> + #{current_read := ReadState0} = ConnnectionStates0, PaddingCheck) -> case ssl_record:decipher(Version, CipherFragment, ReadState0, PaddingCheck) of {PlainFragment, Mac, ReadState1} -> - MacHash = ssl_cipher:calc_mac_hash(Type, Version, PlainFragment, ReadState1), + MacHash = ssl_cipher:calc_mac_hash(CipherText#ssl_tls.type, Version, PlainFragment, ReadState1), case ssl_record:is_correct_mac(Mac, MacHash) of true -> + #{sequence_number := Seq, + compression_state := CompressionS0, + security_parameters := + #security_parameters{compression_algorithm = CompAlg}} = ReadState0, {Plain, CompressionS1} = ssl_record:uncompress(CompAlg, PlainFragment, CompressionS0), - ConnnectionStates = ConnnectionStates0#{ - current_read => ReadState1#{ - sequence_number => Seq + 1, - compression_state => CompressionS1}}, + ConnnectionStates = + ConnnectionStates0#{current_read => + ReadState1#{sequence_number => Seq + 1, + compression_state => CompressionS1}}, {CipherText#ssl_tls{fragment = Plain}, ConnnectionStates}; false -> - ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC) + ?ALERT_REC(?FATAL, ?BAD_RECORD_MAC) end; #alert{} = Alert -> Alert |