diff options
| author | davidben <davidben@webrtc.org> | 2017-04-24 19:44:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-24 19:44:59 +0000 |
| commit | fe330390f0e9b7824ffbfcd1830fe37a1b9f688e (patch) | |
| tree | 20c51f2ef195d318b08bf405c6bce990900bb775 | |
| parent | 5ce6da7cd4f89c84954bf1108fe0cfeca1f384e8 (diff) | |
| parent | 76c221cc32b2dc4e6e9860e2a0c6356c126eb5b0 (diff) | |
| download | webrtc-fe330390f0e9b7824ffbfcd1830fe37a1b9f688e.tar.gz | |
Merge "Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version." am: 0d85cc3c3c am: 1335ab5cae am: c0c6db4af3
am: 76c221cc32
Change-Id: Ia028017fece6983d19b0f3750c459f0787cb7e44
| -rw-r--r-- | webrtc/base/opensslstreamadapter.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc index 7563f17c56..67bd829e1e 100644 --- a/webrtc/base/opensslstreamadapter.cc +++ b/webrtc/base/opensslstreamadapter.cc @@ -967,20 +967,20 @@ SSL_CTX* OpenSSLStreamAdapter::SetupSSLContext() { return NULL; #ifdef OPENSSL_IS_BORINGSSL - SSL_CTX_set_min_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? + SSL_CTX_set_min_proto_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_VERSION : TLS1_VERSION); switch (ssl_max_version_) { case SSL_PROTOCOL_TLS_10: - SSL_CTX_set_max_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? + SSL_CTX_set_max_proto_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_VERSION : TLS1_VERSION); break; case SSL_PROTOCOL_TLS_11: - SSL_CTX_set_max_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? + SSL_CTX_set_max_proto_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_VERSION : TLS1_1_VERSION); break; case SSL_PROTOCOL_TLS_12: default: - SSL_CTX_set_max_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? + SSL_CTX_set_max_proto_version(ctx, ssl_mode_ == SSL_MODE_DTLS ? DTLS1_2_VERSION : TLS1_2_VERSION); break; } |