diff options
| author | Andreas Schultz <[email protected]> | 2014-05-17 15:01:46 +0200 |
|---|---|---|
| committer | Andreas Schultz <[email protected]> | 2014-09-03 15:26:00 +0200 |
| commit | 867e3974db7c48d147f1c2c54899c2834ad3ee3d (patch) | |
| tree | ab5b3be4a7c181f9fbd4b33f5521e31fcd2c218a /lib/ssl/src/ssl_handshake.erl | |
| parent | 5010b791378f4af46176f297888c30ad010a3e83 (diff) | |
| download | otp-867e3974db7c48d147f1c2c54899c2834ad3ee3d.tar.gz otp-867e3974db7c48d147f1c2c54899c2834ad3ee3d.tar.bz2 otp-867e3974db7c48d147f1c2c54899c2834ad3ee3d.zip | |
ssl: implement AES128-GCM suites
Diffstat (limited to 'lib/ssl/src/ssl_handshake.erl')
| -rw-r--r-- | lib/ssl/src/ssl_handshake.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_handshake.erl b/lib/ssl/src/ssl_handshake.erl index 94ffd180c5..04540c6054 100644 --- a/lib/ssl/src/ssl_handshake.erl +++ b/lib/ssl/src/ssl_handshake.erl @@ -1435,6 +1435,7 @@ calc_finished({3, N}, Role, PrfAlgo, MasterSecret, Handshake) -> master_secret(_RecordCB, Version, MasterSecret, #security_parameters{ + bulk_cipher_algorithm = BCA, client_random = ClientRandom, server_random = ServerRandom, hash_size = HashSize, @@ -1453,8 +1454,8 @@ master_secret(_RecordCB, Version, MasterSecret, ssl_record:set_mac_secret(ClientWriteMacSecret, ServerWriteMacSecret, Role, ConnStates1), - ClientCipherState = #cipher_state{iv = ClientIV, key = ClientWriteKey}, - ServerCipherState = #cipher_state{iv = ServerIV, key = ServerWriteKey}, + ClientCipherState = ssl_cipher:cipher_init(BCA, ClientIV, ClientWriteKey), + ServerCipherState = ssl_cipher:cipher_init(BCA, ServerIV, ServerWriteKey), {MasterSecret, ssl_record:set_pending_cipher_state(ConnStates2, ClientCipherState, ServerCipherState, Role)}. |