commit 7f1ffcccce563a086da037334aec2d4faa723edb
author Diogo Real <diogor@google.com> Tue Sep 04 14:42:03 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Sep 04 22:46:19 2018 +0000
tree 8c2c0ed974837f0d1986e221e7d8cb357f016864
parent ee82de28d6442a765de38ed28fce7158c9c94d3d

Add SSLConfig object to IceServer.

This is being added to allow greater configurability to TLS connections.
tlsAlpnProtocols, tlsEllipticCurves and tlsCertPolicy will be removed from IceServer in a
follow-up CL.

Bug: webrtc:9662
Change-Id: I33cb804b02c26c662ed2a28c76f9a9dc2df40f36
Reviewed-on: https://webrtc-review.googlesource.com/96020
Commit-Queue: Diogo Real <diogor@google.com>
Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
Reviewed-by: Benjamin Wright <benwright@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24559}

sdk/objc/unittests/RTCIceServerTest.mm

diff --git a/sdk/objc/unittests/RTCIceServerTest.mm b/sdk/objc/unittests/RTCIceServerTest.mm
index 8ef5195..7659196 100644
--- a/sdk/objc/unittests/RTCIceServerTest.mm
+++ b/sdk/objc/unittests/RTCIceServerTest.mm
@@ -89,7 +89,7 @@
   EXPECT_EQ("username", iceStruct.username);
   EXPECT_EQ("credential", iceStruct.password);
   EXPECT_EQ("hostname", iceStruct.hostname);
-  EXPECT_EQ(2u, iceStruct.tls_alpn_protocols.size());
+  EXPECT_EQ(2u, iceStruct.ssl_config.tls_alpn_protocols.value().size());
 }
 
 - (void)testTlsEllipticCurves {
@@ -106,8 +106,8 @@
   EXPECT_EQ("username", iceStruct.username);
   EXPECT_EQ("credential", iceStruct.password);
   EXPECT_EQ("hostname", iceStruct.hostname);
-  EXPECT_EQ(2u, iceStruct.tls_alpn_protocols.size());
-  EXPECT_EQ(2u, iceStruct.tls_elliptic_curves.size());
+  EXPECT_EQ(2u, iceStruct.ssl_config.tls_alpn_protocols.value().size());
+  EXPECT_EQ(2u, iceStruct.ssl_config.tls_elliptic_curves.value().size());
 }
 
 - (void)testInitFromNativeServer {
@@ -129,8 +129,8 @@
   EXPECT_EQ("username", [NSString stdStringForString:iceServer.username]);
   EXPECT_EQ("password", [NSString stdStringForString:iceServer.credential]);
   EXPECT_EQ("hostname", [NSString stdStringForString:iceServer.hostname]);
-  EXPECT_EQ(2u, iceServer.tlsAlpnProtocols.count);
-  EXPECT_EQ(2u, iceServer.tlsEllipticCurves.count);
+  EXPECT_EQ(2u, iceServer.sslConfig.tlsALPNProtocols.count);
+  EXPECT_EQ(2u, iceServer.sslConfig.tlsEllipticCurves.count);
 }
 
 @end