mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.6.0.150

Browse Source 
Former-commit-id: 73e3bb1e96dd09dc931c1dfe559d2c7f7b8b02c7
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-23 13:20:38 +00:00
parent 02ac915603
commit b95516a3dd
239 changed files with 4096 additions and 1544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System.ServiceModel/System.ServiceModel.Security/X509CertificateInitiatorClientCredential.cs
View File

@ -31,7 +31,7 @@ using System.Security.Cryptography.X509Certificates;
using System.ServiceModel.Channels;
using System.ServiceModel.Configuration;
using System.ServiceModel.Description;
using System.ServiceModel.Security.Tokens;
using System.ServiceModel.Security.Tokens;
namespace System.ServiceModel.Security
{
@ -57,14 +57,22 @@ namespace System.ServiceModel.Security
StoreName storeName, X509FindType findType,
object findValue)
{
#if !NET_2_1
certificate = ConfigUtil.CreateCertificateFrom (storeLocation, storeName, findType, findValue);
#else
throw new NotImplementedException ();
#endif
}
public void SetCertificate (
string subjectName, StoreLocation storeLocation,
StoreName storeName)
{
#if !NET_2_1
certificate = ConfigUtil.CreateCertificateFrom (storeLocation, storeName, X509FindType.FindBySubjectName, subjectName);
#else
throw new NotImplementedException ();
#endif
}
}
}

19
mcs/class/System.ServiceModel/System.ServiceModel.Security/X509CertificateRecipientClientCredential.cs
View File

@ -27,7 +27,9 @@
//
using System;
using System.Collections.Generic;
#if !NET_2_1
using System.IdentityModel.Selectors;
#endif
using System.Security.Cryptography.X509Certificates;
using System.ServiceModel.Channels;
using System.ServiceModel.Configuration;
@ -47,7 +49,9 @@ namespace System.ServiceModel.Security
X509Certificate2 certificate;
Dictionary<Uri,X509Certificate2> scoped =
new Dictionary<Uri,X509Certificate2> ();
#if !NET_2_1
X509CertificateValidator validator;
#endif
X509RevocationMode revocation_mode;
StoreLocation store_loc;
@ -72,6 +76,13 @@ namespace System.ServiceModel.Security
get { return scoped; }
}
[MonoTODO]
public X509ServiceCertificateAuthentication SslCertificateAuthentication
{
get { throw new NotImplementedException (); }
set { throw new NotImplementedException (); }
}
public void SetDefaultCertificate (string subjectName,
StoreLocation storeLocation, StoreName storeName)
{
@ -81,7 +92,11 @@ namespace System.ServiceModel.Security
public void SetDefaultCertificate (StoreLocation storeLocation,
StoreName storeName, X509FindType findType, Object findValue)
{
#if !NET_2_1
DefaultCertificate = ConfigUtil.CreateCertificateFrom (storeLocation, storeName, findType, findValue);
#else
throw new NotImplementedException ();
#endif
}
public void SetScopedCertificate (string subjectName,
@ -95,7 +110,11 @@ namespace System.ServiceModel.Security
StoreName storeName, X509FindType findType,
Object findValue, Uri targetService)
{
#if !NET_2_1
ScopedCertificates [targetService] = ConfigUtil.CreateCertificateFrom (storeLocation, storeName, findType, findValue);
#else
throw new NotImplementedException ();
#endif
}
}
}

2
mcs/class/System.ServiceModel/System.ServiceModel.Security/X509ServiceCertificateAuthentication.cs
View File

@ -37,7 +37,7 @@ namespace System.ServiceModel.Security
[MonoTODO]
public class X509ServiceCertificateAuthentication
{
internal X509ServiceCertificateAuthentication ()
public X509ServiceCertificateAuthentication ()
{
}