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

Use SSL_CTX_set_max_proto_version instead of SSL_CTX_set_max_version.

Browse Source 
These functions are identical. BoringSSL added these APIs, then OpenSSL
1.1.0 added similar ones but with slightly longer names. We're
standardizing on the OpenSSL names to avoid API skew.

This is a cherry-pick of https://codereview.webrtc.org/2550423004.

Test: mma
Change-Id: Iffe4416bd300d71bbaa94c7c127ae89d6286cd7b
This commit is contained in:
davidben
2016-12-06 17:12:02 -08:00
committed by David Benjamin
parent 4cc6c9fa1f
commit 458ffd574b
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;
#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;
}