Quellcode durchsuchen

[Mono.Security]: Rename 'MonoTlsSettings.ServerCertificateValidationCallback' into 'RemoteCertificateValidationCallback'.

This callback is also used to validate client-certificates when using SslStream in server-mode.
Martin Baulig vor 10 Jahren
Ursprung
Commit
a76f2dcb0c

+ 2 - 2
mcs/class/Mono.Security/Mono.Security.Interface/MonoTlsSettings.cs

@@ -29,7 +29,7 @@ namespace Mono.Security.Interface
 {
 	public sealed class MonoTlsSettings
 	{
-		public MonoRemoteCertificateValidationCallback ServerCertificateValidationCallback {
+		public MonoRemoteCertificateValidationCallback RemoteCertificateValidationCallback {
 			get; set;
 		}
 
@@ -98,7 +98,7 @@ namespace Mono.Security.Interface
 			}
 
 			var copy = new MonoTlsSettings ();
-			copy.ServerCertificateValidationCallback = ServerCertificateValidationCallback;
+			copy.RemoteCertificateValidationCallback = RemoteCertificateValidationCallback;
 			copy.ClientCertificateSelectionCallback = ClientCertificateSelectionCallback;
 			copy.checkCertName = checkCertName;
 			copy.checkCertRevocationStatus = checkCertRevocationStatus;

+ 2 - 2
mcs/class/System/Mono.Net.Security/ChainValidationHelper.cs

@@ -176,8 +176,8 @@ namespace Mono.Net.Security
 			var fallbackToSPM = false;
 
 			if (settings != null) {
-				if (settings.ServerCertificateValidationCallback != null) {
-					var callback = Private.CallbackHelpers.MonoToPublic (settings.ServerCertificateValidationCallback);
+				if (settings.RemoteCertificateValidationCallback != null) {
+					var callback = Private.CallbackHelpers.MonoToPublic (settings.RemoteCertificateValidationCallback);
 					certValidationCallback = new ServerCertValidationCallback (callback);
 				}
 				certSelectionCallback = Private.CallbackHelpers.MonoToInternal (settings.ClientCertificateSelectionCallback);

+ 1 - 1
mcs/class/System/System.Net.Security/SslStream.cs

@@ -388,7 +388,7 @@ namespace System.Net.Security
 			// does not provide a verification callback but attempts to authenticate with the website
 			// as a client (see https://bugzilla.xamarin.com/show_bug.cgi?id=18962 for an example)
 			var settings = new MonoTlsSettings ();
-			settings.ServerCertificateValidationCallback = MNS.Private.CallbackHelpers.PublicToMono (validation_callback);
+			settings.RemoteCertificateValidationCallback = MNS.Private.CallbackHelpers.PublicToMono (validation_callback);
 			var helper = MNS.ChainValidationHelper.Create (ref settings, null);
 			s.ServerCertValidation2 += (certs) => helper.ValidateChain (targetHost, certs);
 			if (selection_callback != null)