commit 9c147ddc910d21e28ccfe6bb9a52b0b62c0e586c
author Sergey Silkin <ssilkin@webrtc.org> Wed Sep 12 10:45:38 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Sep 12 10:46:04 2018 +0000
tree 01c64ccf82baa651a9f88880961aefa16e5144fe
parent 289e980708fc709c4f55c35500473fd424fa291a

Revert "Add SSLConfig object to IceServer."

This reverts commit 4f085434b912060874d6697f17aaedd2adae7c49.

Reason for revert: breaks downstream projects.

Original change's description:
> Add SSLConfig object to IceServer.
> 
> This is a rollforward of https://webrtc-review.googlesource.com/c/src/+/96020,
> with the addition of setting the old tlsCertPolicy, tlsAlpnProtocols and
> tlsEllipticCurves in the RTCIceServer initializer, for backwards compatibility.
> 
> Bug: webrtc:9662
> Change-Id: I28706ed4ff5abe3f7f913f105779f0e5412aeac5
> Reviewed-on: https://webrtc-review.googlesource.com/98762
> Commit-Queue: Diogo Real <diogor@google.com>
> Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Reviewed-by: Steve Anton <steveanton@webrtc.org>
> Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#24696}

TBR=steveanton@webrtc.org,sakal@webrtc.org,kwiberg@webrtc.org,kthelgason@webrtc.org,qingsi@webrtc.org,benwright@webrtc.org,diogor@google.com

Change-Id: I1cb64b63fec688b4ac90c2fa368eaf0bc11046af
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:9662
Reviewed-on: https://webrtc-review.googlesource.com/99880
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24701}

pc/iceserverparsing.cc

diff --git a/pc/iceserverparsing.cc b/pc/iceserverparsing.cc
index 74d1ed2..806fb3b 100644
--- a/pc/iceserverparsing.cc
+++ b/pc/iceserverparsing.cc
@@ -14,7 +14,6 @@
 #include <string>
 
 #include "rtc_base/arraysize.h"
-#include "rtc_base/ssladapter.h"
 
 namespace webrtc {
 
@@ -255,22 +254,13 @@
       }
       cricket::RelayServerConfig config = cricket::RelayServerConfig(
           socket_address, username, server.password, turn_transport_type);
-
-      config.ssl_config = server.ssl_config;
-
       if (server.tls_cert_policy ==
           PeerConnectionInterface::kTlsCertPolicyInsecureNoCheck) {
-        config.ssl_config.tls_cert_policy =
-            rtc::TlsCertPolicy::TLS_CERT_POLICY_INSECURE_NO_CHECK;
+        config.tls_cert_policy =
+            cricket::TlsCertPolicy::TLS_CERT_POLICY_INSECURE_NO_CHECK;
       }
-      if (!server.ssl_config.tls_alpn_protocols.has_value() &&
-          !server.tls_alpn_protocols.empty()) {
-        config.ssl_config.tls_alpn_protocols = server.tls_alpn_protocols;
-      }
-      if (!server.ssl_config.tls_elliptic_curves.has_value() &&
-          !server.tls_elliptic_curves.empty()) {
-        config.ssl_config.tls_elliptic_curves = server.tls_elliptic_curves;
-      }
+      config.tls_alpn_protocols = server.tls_alpn_protocols;
+      config.tls_elliptic_curves = server.tls_elliptic_curves;
 
       turn_servers->push_back(config);
       break;