diff options
| author | Adam Vartanian <flooey@google.com> | 2018-08-10 14:55:24 +0100 |
|---|---|---|
| committer | Adam Vartanian <flooey@google.com> | 2018-08-10 15:32:39 +0100 |
| commit | bfcf3a72c0bcb62cfde80e932db0668a7f96c0f8 (patch) | |
| tree | 3ab110046e45c25f8f69df137f8a9d4a52bf60b5 /src/ssl/s3_lib.cc | |
| parent | 6120b2b9dfbe5b19fe2d0f69a4b8418ad5f7fe08 (diff) | |
| download | boringssl-bfcf3a72c0bcb62cfde80e932db0668a7f96c0f8.tar.gz | |
external/boringssl: Sync to 8625ec4b436ccb4098ed4aac10891eff8372be41.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/c596415ec62b501523d80f9afa26b135406da6bf..8625ec4b436ccb4098ed4aac10891eff8372be41
Test: cts -m CtsLibcoreTestCases
Change-Id: I47a45e6b6f46b19fcbcb6c917895867d56dcd2ca
Diffstat (limited to 'src/ssl/s3_lib.cc')
| -rw-r--r-- | src/ssl/s3_lib.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/ssl/s3_lib.cc b/src/ssl/s3_lib.cc index b1fc5fbf..9e4d7d8a 100644 --- a/src/ssl/s3_lib.cc +++ b/src/ssl/s3_lib.cc @@ -173,7 +173,7 @@ SSL3_STATE::SSL3_STATE() initial_handshake_complete(false), session_reused(false), send_connection_binding(false), - tlsext_channel_id_valid(false), + channel_id_valid(false), key_update_pending(false), wpend_pending(false), early_data_accepted(false), @@ -215,12 +215,4 @@ void ssl3_free(SSL *ssl) { ssl->s3 = NULL; } -const SSLCipherPreferenceList *ssl_get_cipher_preferences(const SSL *ssl) { - if (ssl->cipher_list != NULL) { - return ssl->cipher_list; - } - - return ssl->ctx->cipher_list; -} - } // namespace bssl |