commit c0c6db4af3229d49532da4d2278f54dab42ae4ba
author davidben <davidben@webrtc.org> Mon Apr 24 19:18:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 24 19:18:13 2017 +0000
tree 1e7a832737d93a7f26173d701e43ef1970449b0e
parent 564d8d32cbef09a569844f9bf16d1433b5540f5e
parent 1335ab5caed5388ffe32abb4a7fe7ed328e5fb84

Merge "Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version." am: 0d85cc3c3c
am: 1335ab5cae

Change-Id: I9ef346f9718c83ce8bc715e12d4a69fa2cd2dfed

webrtc/base/opensslstreamadapter.cc

diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc
index 7563f17..67bd829 100644
--- a/webrtc/base/opensslstreamadapter.cc
+++ b/webrtc/base/opensslstreamadapter.cc
@@ -967,20 +967,20 @@
     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;
   }