Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -82,17 +82,10 @@ namespace Mono.Btls
[DllImport (BTLS_DYLIB)]
extern static IntPtr mono_btls_x509_lookup_peek_lookup (IntPtr handle);
MonoBtlsX509Store store;
MonoBtlsX509LookupType type;
List<MonoBtlsX509LookupMono> monoLookups;
#if FIXME
// Do we need this?
internal MonoBtlsX509Lookup (BoringX509LookupHandle handle)
: base (handle)
{
}
#endif
static BoringX509LookupHandle Create_internal (MonoBtlsX509Store store, MonoBtlsX509LookupType type)
{
var handle = mono_btls_x509_lookup_new (
@@ -105,6 +98,7 @@ namespace Mono.Btls
internal MonoBtlsX509Lookup (MonoBtlsX509Store store, MonoBtlsX509LookupType type)
: base (Create_internal (store, type))
{
this.store = store;
this.type = type;
}
@@ -151,6 +145,7 @@ namespace Mono.Btls
var ret = mono_btls_x509_lookup_add_mono (
Handle.DangerousGetHandle (), monoLookup.Handle.DangerousGetHandle ());
CheckError (ret);
monoLookup.Install (this);
if (monoLookups == null)
monoLookups = new List<MonoBtlsX509LookupMono> ();
@@ -196,6 +191,11 @@ namespace Mono.Btls
}
}
internal void AddCertificate (MonoBtlsX509 certificate)
{
store.AddCertificate (certificate);
}
protected override void Close ()
{
try {