| commit | b1b54b8cac71baef44b92c79271f26d50819b2f7 | [log] [tgz] |
|---|---|---|
| author | Robert Sloan <varomodt@google.com> | Mon Nov 06 13:50:02 2017 -0800 |
| committer | Robert Sloan <varomodt@google.com> | Mon Nov 06 13:50:16 2017 -0800 |
| tree | 1f8843cd6e2baf80ce70ae5e2bfd770543aa8aee | |
| parent | 29c1d2cf8620ad14e06d8e7ff91db8f4de04d481 [diff] [blame] |
external/boringssl: Sync to b1cbe1979008debd0541621584b00e010d9935dd. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/ba94746eb2b4b59a0eb72047e4ca2d2d54454c87..b1cbe1979008debd0541621584b00e010d9935dd Test: BoringSSL CTS Presubmits. Change-Id: I143290c32ebd3d98f5a35ec8899df44983b73b8a
diff --git a/src/ssl/handshake_server.cc b/src/ssl/handshake_server.cc index d346875..bb565e9 100644 --- a/src/ssl/handshake_server.cc +++ b/src/ssl/handshake_server.cc
@@ -1243,8 +1243,7 @@ // Compute the master secret. hs->new_session->master_key_length = tls1_generate_master_secret( - hs, hs->new_session->master_key, premaster_secret.data(), - premaster_secret.size()); + hs, hs->new_session->master_key, premaster_secret); if (hs->new_session->master_key_length == 0) { return ssl_hs_error; }