diff options
| author | Robert Sloan <varomodt@google.com> | 2018-04-30 10:10:26 -0700 |
|---|---|---|
| committer | Robert Sloan <varomodt@google.com> | 2018-04-30 10:12:11 -0700 |
| commit | c6ebb28b08232d4af3e99643b4e260b98381b4c6 (patch) | |
| tree | 157fb564e2e4212f88f84ab791fd02d550fe7699 /src/ssl/s3_lib.cc | |
| parent | 5cbb5c8e9904cdd70a9336405c9c561a6b745a8a (diff) | |
| download | boringssl-c6ebb28b08232d4af3e99643b4e260b98381b4c6.tar.gz | |
external/boringssl: Sync to c596415ec62b501523d80f9afa26b135406da6bf.android-wear-p-preview-2android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.0
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/a63d0ad40dd621d5b9472dc9f1756692f969451e..c596415ec62b501523d80f9afa26b135406da6bf
Test: BoringSSL CTS Presubmits.
Change-Id: I2e7a311729800d6c16bdde42b82ebde8a8fa4e39
Diffstat (limited to 'src/ssl/s3_lib.cc')
| -rw-r--r-- | src/ssl/s3_lib.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ssl/s3_lib.cc b/src/ssl/s3_lib.cc index baa5a174..b1fc5fbf 100644 --- a/src/ssl/s3_lib.cc +++ b/src/ssl/s3_lib.cc @@ -215,8 +215,7 @@ void ssl3_free(SSL *ssl) { ssl->s3 = NULL; } -const struct ssl_cipher_preference_list_st *ssl_get_cipher_preferences( - const SSL *ssl) { +const SSLCipherPreferenceList *ssl_get_cipher_preferences(const SSL *ssl) { if (ssl->cipher_list != NULL) { return ssl->cipher_list; } |