Imported Upstream version 5.14.0.78

Former-commit-id: 3494343bcc9ddb42b36b82dd9ae7b69e85e0229f
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-05-10 08:37:03 +00:00
parent 74b74abd9f
commit 19234507ba
1776 changed files with 67755 additions and 31107 deletions

View File

@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if SECURITY_DEP
#if MONO_SECURITY_ALIAS
extern alias MonoSecurity;
using MonoSecurity::Mono.Security;
@ -40,8 +38,6 @@ using Mono.Security.Cryptography;
using MX = Mono.Security.X509;
#endif
#endif
using System.IO;
using System.Text;
using System.Collections;
@ -52,13 +48,6 @@ namespace System.Security.Cryptography.X509Certificates {
[Serializable]
public class X509Certificate2 : X509Certificate {
#if !SECURITY_DEP
// Used in Mono.Security HttpsClientStream
public X509Certificate2 (byte[] rawData)
{
}
#endif
#if SECURITY_DEP
new internal X509Certificate2Impl Impl {
get {
var impl2 = base.Impl as X509Certificate2Impl;
@ -405,13 +394,5 @@ namespace System.Security.Cryptography.X509Certificates {
return X509Helper2.GetMonoCertificate (this);
}
}
#else
// HACK - this ensure the type X509Certificate2 and PrivateKey property exists in the build before
// Mono.Security.dll is built. This is required to get working client certificate in SSL/TLS
public AsymmetricAlgorithm PrivateKey {
get { return null; }
}
#endif
}
}