Revert "Add SSLConfig object to IceServer."
This reverts commit 7f1ffcccce563a086da037334aec2d4faa723edb. Reason for revert: Speculative revert Original change's description: > 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} TBR=steveanton@webrtc.org,sakal@webrtc.org,kthelgason@webrtc.org,juberti@webrtc.org,emadomara@webrtc.org,qingsi@webrtc.org,benwright@webrtc.org,diogor@google.com Change-Id: Iae9fc68b77f743876bda36fc2a04f6d791aae8e2 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:9662 Reviewed-on: https://webrtc-review.googlesource.com/98000 Reviewed-by: Ying Wang <yinwa@webrtc.org> Commit-Queue: Ying Wang <yinwa@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24563}
This commit is contained in:
@ -11,7 +11,11 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
#import "RTCMacros.h"
|
||||
#import "RTCSSLConfig.h"
|
||||
|
||||
typedef NS_ENUM(NSUInteger, RTCTlsCertPolicy) {
|
||||
RTCTlsCertPolicySecure,
|
||||
RTCTlsCertPolicyInsecureNoCheck
|
||||
};
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@ -28,8 +32,7 @@ RTC_EXPORT
|
||||
@property(nonatomic, readonly, nullable) NSString *credential;
|
||||
|
||||
/**
|
||||
Deprecated. TODO(diogor, webrtc:9673): Remove from API.
|
||||
TLS certificate policy to use if this RTCIceServer object is a TURN server.
|
||||
* TLS certificate policy to use if this RTCIceServer object is a TURN server.
|
||||
*/
|
||||
@property(nonatomic, readonly) RTCTlsCertPolicy tlsCertPolicy;
|
||||
|
||||
@ -40,24 +43,15 @@ RTC_EXPORT
|
||||
*/
|
||||
@property(nonatomic, readonly, nullable) NSString *hostname;
|
||||
|
||||
/**
|
||||
Deprecated. TODO(diogor, webrtc:9673): Remove from API.
|
||||
List of protocols to be used in the TLS ALPN extension.
|
||||
This field will be ignored if also set in RTCSSLConfig.
|
||||
*/
|
||||
/** List of protocols to be used in the TLS ALPN extension. */
|
||||
@property(nonatomic, readonly) NSArray<NSString *> *tlsAlpnProtocols;
|
||||
|
||||
/**
|
||||
Deprecated. TODO(diogor, webrtc:9673): Remove from API.
|
||||
List elliptic curves to be used in the TLS elliptic curves extension.
|
||||
Only curve names supported by OpenSSL should be used (eg. "P-256","X25519").
|
||||
This field will be ignored if also set in RTCSSLConfig.
|
||||
*/
|
||||
@property(nonatomic, readonly) NSArray<NSString *> *tlsEllipticCurves;
|
||||
|
||||
/** SSL configuration options for any SSL/TLS connections to this IceServer. */
|
||||
@property(nonatomic, readonly) RTCSSLConfig *sslConfig;
|
||||
|
||||
- (nonnull instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
/** Convenience initializer for a server with no authentication (e.g. STUN). */
|
||||
@ -112,17 +106,8 @@ RTC_EXPORT
|
||||
tlsCertPolicy:(RTCTlsCertPolicy)tlsCertPolicy
|
||||
hostname:(nullable NSString *)hostname
|
||||
tlsAlpnProtocols:(nullable NSArray<NSString *> *)tlsAlpnProtocols
|
||||
tlsEllipticCurves:(nullable NSArray<NSString *> *)tlsEllipticCurves;
|
||||
|
||||
/**
|
||||
* Initialize an RTCIceServer with its associated URLs, optional
|
||||
* username, optional credential, hostname and SSL config.
|
||||
*/
|
||||
- (instancetype)initWithURLStrings:(NSArray<NSString *> *)urlStrings
|
||||
username:(nullable NSString *)username
|
||||
credential:(nullable NSString *)credential
|
||||
hostname:(nullable NSString *)hostname
|
||||
sslConfig:(RTCSSLConfig *)sslConfig NS_DESIGNATED_INITIALIZER;
|
||||
tlsEllipticCurves:(nullable NSArray<NSString *> *)tlsEllipticCurves
|
||||
NS_DESIGNATED_INITIALIZER;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user