diff options
| author | Joachim Bauch <jbauch@webrtc.org> | 2015-06-02 23:07:43 +0200 |
|---|---|---|
| committer | Joachim Bauch <jbauch@webrtc.org> | 2015-06-02 21:07:50 +0000 |
| commit | a398020cba1279e4393fa25cf22a6260aa669766 (patch) | |
| tree | 3dc4f2fccb7424d85cfc0944ac43abba63e769e5 /webrtc/base/opensslstreamadapter.cc | |
| parent | 308d163c715df7b4348a1e00bf2a6761c0adb689 (diff) | |
| download | webrtc-a398020cba1279e4393fa25cf22a6260aa669766.tar.gz | |
SSL_set_read_ahead no longer needed with BoringSSL.
In https://boringssl-review.googlesource.com/#/c/4820/ BoringSSL
deprecated "SSL_set_read_ahead". That commit has rolled into
Chromium/WebRTC, so calling the function is no longer needed.
BUG=chromium:447431
R=juberti@google.com
Review URL: https://webrtc-codereview.appspot.com/55559004
Cr-Commit-Position: refs/heads/master@{#9355}
Diffstat (limited to 'webrtc/base/opensslstreamadapter.cc')
| -rw-r--r-- | webrtc/base/opensslstreamadapter.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc index 3a7e7012ce..e12940fbeb 100644 --- a/webrtc/base/opensslstreamadapter.cc +++ b/webrtc/base/opensslstreamadapter.cc @@ -759,12 +759,13 @@ int OpenSSLStreamAdapter::BeginSSL() { SSL_set_app_data(ssl_, this); SSL_set_bio(ssl_, bio, bio); // the SSL object owns the bio now. +#ifndef OPENSSL_IS_BORINGSSL if (ssl_mode_ == SSL_MODE_DTLS) { // Enable read-ahead for DTLS so whole packets are read from internal BIO - // before parsing. - // TODO(jbauch): Remove for BoringSSL when this is handled internally. + // before parsing. This is done internally by BoringSSL for DTLS. SSL_set_read_ahead(ssl_, 1); } +#endif SSL_set_mode(ssl_, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); |