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}

sdk/android/src/jni/pc/peerconnection.cc

@@ -51,6 +51,7 @@
 #include "sdk/android/src/jni/pc/rtpsender.h"
 #include "sdk/android/src/jni/pc/sdpobserver.h"
 #include "sdk/android/src/jni/pc/sessiondescription.h"
+#include "sdk/android/src/jni/pc/sslconfig.h"
 #include "sdk/android/src/jni/pc/statsobserver.h"
 #include "sdk/android/src/jni/pc/turncustomizer.h"
 
@@ -87,6 +88,8 @@ PeerConnectionInterface::IceServers JavaToNativeIceServers(
         Java_IceServer_getTlsAlpnProtocols(jni, j_ice_server);
     ScopedJavaLocalRef<jobject> tls_elliptic_curves =
         Java_IceServer_getTlsEllipticCurves(jni, j_ice_server);
+    ScopedJavaLocalRef<jobject> ssl_config =
+        Java_IceServer_getSslConfig(jni, j_ice_server);
     PeerConnectionInterface::IceServer server;
     server.urls = JavaListToNativeVector<std::string, jstring>(
         jni, urls, &JavaToNativeString);
@@ -98,6 +101,7 @@ PeerConnectionInterface::IceServers JavaToNativeIceServers(
         jni, tls_alpn_protocols, &JavaToNativeString);
     server.tls_elliptic_curves = JavaListToNativeVector<std::string, jstring>(
         jni, tls_elliptic_curves, &JavaToNativeString);
+    server.ssl_config = JavaToNativeSslConfig(jni, ssl_config);
     ice_servers.push_back(server);
   }
   return ice_servers;

sdk/android/src/jni/pc/sslconfig.cc

@@ -0,0 +1,78 @@
+
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "sdk/android/src/jni/pc/sslconfig.h"
+
+#include <string>
+
+#include "rtc_base/ssladapter.h"
+#include "sdk/android/generated_peerconnection_jni/jni/SslConfig_jni.h"
+#include "sdk/android/native_api/jni/java_types.h"
+#include "sdk/android/src/jni/jni_helpers.h"
+
+namespace webrtc {
+namespace jni {
+
+rtc::TlsCertPolicy JavaToNativeRtcTlsCertPolicy(
+    JNIEnv* jni,
+    const JavaRef<jobject>& j_ssl_config_tls_cert_policy) {
+  std::string enum_name = GetJavaEnumName(jni, j_ssl_config_tls_cert_policy);
+
+  if (enum_name == "TLS_CERT_POLICY_SECURE")
+    return rtc::TlsCertPolicy::TLS_CERT_POLICY_SECURE;
+
+  if (enum_name == "TLS_CERT_POLICY_INSECURE_NO_CHECK")
+    return rtc::TlsCertPolicy::TLS_CERT_POLICY_INSECURE_NO_CHECK;
+
+  RTC_NOTREACHED();
+  return rtc::TlsCertPolicy::TLS_CERT_POLICY_SECURE;
+}
+
+rtc::SSLConfig JavaToNativeSslConfig(JNIEnv* jni,
+                                     const JavaRef<jobject>& j_ssl_config) {
+  rtc::SSLConfig ssl_config;
+  ssl_config.enable_ocsp_stapling =
+      Java_SslConfig_getEnableOcspStapling(jni, j_ssl_config);
+  ssl_config.enable_signed_cert_timestamp =
+      Java_SslConfig_getEnableSignedCertTimestamp(jni, j_ssl_config);
+  ssl_config.enable_tls_channel_id =
+      Java_SslConfig_getEnableTlsChannelId(jni, j_ssl_config);
+  ssl_config.enable_grease = Java_SslConfig_getEnableGrease(jni, j_ssl_config);
+
+  ScopedJavaLocalRef<jobject> j_ssl_config_max_ssl_version =
+      Java_SslConfig_getMaxSslVersion(jni, j_ssl_config);
+  ssl_config.max_ssl_version =
+      JavaToNativeOptionalInt(jni, j_ssl_config_max_ssl_version);
+
+  ScopedJavaLocalRef<jobject> j_ssl_config_tls_cert_policy =
+      Java_SslConfig_getTlsCertPolicy(jni, j_ssl_config);
+  ssl_config.tls_cert_policy =
+      JavaToNativeRtcTlsCertPolicy(jni, j_ssl_config_tls_cert_policy);
+
+  ScopedJavaLocalRef<jobject> j_ssl_config_tls_alpn_protocols =
+      Java_SslConfig_getTlsAlpnProtocols(jni, j_ssl_config);
+  if (!IsNull(jni, j_ssl_config_tls_alpn_protocols)) {
+    ssl_config.tls_alpn_protocols =
+        JavaListToNativeVector<std::string, jstring>(
+            jni, j_ssl_config_tls_alpn_protocols, &JavaToNativeString);
+  }
+  ScopedJavaLocalRef<jobject> j_ssl_config_tls_elliptic_curves =
+      Java_SslConfig_getTlsEllipticCurves(jni, j_ssl_config);
+  if (!IsNull(jni, j_ssl_config_tls_elliptic_curves)) {
+    ssl_config.tls_elliptic_curves =
+        JavaListToNativeVector<std::string, jstring>(
+            jni, j_ssl_config_tls_elliptic_curves, &JavaToNativeString);
+  }
+  return ssl_config;
+}
+
+}  // namespace jni
+}  // namespace webrtc

sdk/android/src/jni/pc/sslconfig.h

@@ -0,0 +1,30 @@
+/*
+ *  Copyright 2018 The WebRTC project authors. All Rights Reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef SDK_ANDROID_SRC_JNI_PC_SSLCONFIG_H_
+#define SDK_ANDROID_SRC_JNI_PC_SSLCONFIG_H_
+
+#include "api/peerconnectioninterface.h"
+#include "sdk/android/native_api/jni/scoped_java_ref.h"
+
+namespace webrtc {
+namespace jni {
+
+rtc::TlsCertPolicy JavaToNativeRtcTlsCertPolicy(
+    JNIEnv* jni,
+    const JavaRef<jobject>& j_ssl_config_tls_cert_policy);
+
+rtc::SSLConfig JavaToNativeSslConfig(JNIEnv* env,
+                                     const JavaRef<jobject>& j_ssl_config);
+
+}  // namespace jni
+}  // namespace webrtc
+
+#endif  // SDK_ANDROID_SRC_JNI_PC_SSLCONFIG_H_