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

Imported Upstream version 4.8.0.483

Browse Source 
Former-commit-id: dea8c53844337fa8b7535e16c76a043c3f09ea30
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-02-07 11:16:48 +00:00
parent c135664484
commit f38a7b4f5b
21 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mcs/class/System/Mono.Btls/X509CertificateImplBtls.cs
View File

@@ -386,11 +386,13 @@ namespace Mono.Btls
void Import (byte[] data)
{
// Does it look like PEM?
if ((data.Length > 0) && (data [0] != 0x30))
x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.PEM);
else
x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.DER);
if (data != null) {
// Does it look like PEM?
if ((data.Length > 0) && (data [0] != 0x30))
x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.PEM);
else
x509 = MonoBtlsX509.LoadFromData (data, MonoBtlsX509Format.DER);
}
}
void ImportPkcs12 (byte[] data, string password)

2
mcs/class/lib/monolite/System.dll.REMOVED.git-id
View File

@@ -1 +1 @@
1b02069d31f86ebdd8652df6da8516f39b4d9c66
ab52f34a16be899445ac46f7fa080754b4035145

1
mcs/tools/linker/Mono.Linker.Steps/SweepStep.cs
View File

@@ -165,6 +165,7 @@ namespace Mono.Linker.Steps {
if ((td != null) && Annotations.IsMarked (td)) {
scope = assembly.MainModule.ImportReference (td).Scope;
hash.Add (td, scope);
et.Scope = scope;
}
}
}