zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version."

Browse Source 
am: 0d85cc3c3c

Change-Id: I797c6180590a2b320a62553f74a46889662a4ba1
This commit is contained in:
davidben
2017-04-24 19:10:26 +00:00
committed by android-build-merger
parent d70176e5a0 0d85cc3c3c
commit 1335ab5cae
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/base/opensslstreamadapter.cc
View File

@ -967,20 +967,20 @@ SSL_CTX* OpenSSLStreamAdapter::SetupSSLContext() {
return NULL; return NULL;
#ifdef OPENSSL_IS_BORINGSSL #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); DTLS1_VERSION : TLS1_VERSION);
switch (ssl_max_version_) { switch (ssl_max_version_) {
case SSL_PROTOCOL_TLS_10: 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); DTLS1_VERSION : TLS1_VERSION);
break; break;
case SSL_PROTOCOL_TLS_11: 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); DTLS1_VERSION : TLS1_1_VERSION);
break; break;
case SSL_PROTOCOL_TLS_12: case SSL_PROTOCOL_TLS_12:
default: 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); DTLS1_2_VERSION : TLS1_2_VERSION);
break; break;
} }