Skip to content

[runtime options] Default tls-provider to Apple TLS #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spouliot merged 1 commit into from
May 4, 2016
Merged

[runtime options] Default tls-provider to Apple TLS #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/ObjCRuntime/RuntimeOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,13 @@ internal static TypeDefinition GetTlsProvider (RuntimeOptions options, ModuleDef
var provider = options != null ? options.tls_provider : DefaultTlsProviderValue;
TypeDefinition type;
switch (provider) {
case LegacyTlsProviderValue:
// FIXME: For the moment, we can do the same as for "default" here - once we switch
// to make appletls the default, we'll need to do something here.
case DefaultTlsProviderValue:
// We'll return null to let MonoTlsProviderFactory select the default provider.
type = module.GetType (Namespaces.Security + ".Tls.OldTlsProvider");
break;
case AppleTlsProviderValue:
type = module.GetType (Namespaces.Security + ".Tls.AppleTlsProvider");
break;
case LegacyTlsProviderValue:
type = module.GetType (Namespaces.Security + ".Tls.OldTlsProvider");
break;
default:
throw new InvalidOperationException (string.Format ("Unknown TlsProvider `{0}`.", provider));
}
Expand Down Expand Up @@ -223,10 +220,10 @@ internal static MonoTlsProvider GetTlsProvider ()
switch (options.tls_provider) {
case null:
case DefaultTlsProviderValue:
case LegacyTlsProviderValue:
return new OldTlsProvider ();
case AppleTlsProviderValue:
return new AppleTlsProvider ();
case LegacyTlsProviderValue:
return new OldTlsProvider ();
default:
throw new InvalidOperationException (string.Format ("Invalid TLS Provider `{0}'.", options.tls_provider));
}
Expand Down