generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SSL_set_read_ahead no longer needed with BoringSSL.

Browse Source 
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}
This commit is contained in:
Joachim Bauch 2015-06-02 23:07:43 +02:00
parent 308d163c71
commit a398020cba
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/base/opensslstreamadapter.cc
View File

@ -759,12 +759,13 @@ int OpenSSLStreamAdapter::BeginSSL() {
SSL_set_app_data(ssl_, this); SSL_set_app_data(ssl_, this);
SSL_set_bio(ssl_, bio, bio); // the SSL object owns the bio now. SSL_set_bio(ssl_, bio, bio); // the SSL object owns the bio now.
#ifndef OPENSSL_IS_BORINGSSL
if (ssl_mode_ == SSL_MODE_DTLS) { if (ssl_mode_ == SSL_MODE_DTLS) {
// Enable read-ahead for DTLS so whole packets are read from internal BIO // Enable read-ahead for DTLS so whole packets are read from internal BIO
// before parsing. // before parsing. This is done internally by BoringSSL for DTLS.
// TODO(jbauch): Remove for BoringSSL when this is handled internally.
SSL_set_read_ahead(ssl_, 1); SSL_set_read_ahead(ssl_, 1);
} }
#endif
SSL_set_mode(ssl_, SSL_MODE_ENABLE_PARTIAL_WRITE | SSL_set_mode(ssl_, SSL_MODE_ENABLE_PARTIAL_WRITE |
SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);