Imported Upstream version 5.10.0.97

Former-commit-id: 342b95328bb2df3d11df4dc7b0c4bfd8ea99763a
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-02-08 19:41:13 +00:00
parent 06a4bb97d8
commit 2f56126bcb
60 changed files with 300 additions and 42 deletions

View File

@ -4,7 +4,8 @@
../../../external/corefx/src/Common/src/System/Net/Security/Unix/SafeDeleteContext.cs
../../../external/corefx/src/Common/src/System/Net/Security/Unix/SafeFreeCredentials.cs
../../../external/corefx/src/Common/src/Microsoft/Win32/SafeHandles/GssSafeHandles.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
corefx/Interop.NetSecurityNative.cs
#../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
../../../external/corefx/src/Common/src/System/Net/Security/Unix/SafeFreeNegoCredentials.cs
../../../external/corefx/src/Common/src/Interop/Unix/Interop.Libraries.cs
../../../external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.GssBuffer.cs

View File

@ -0,0 +1,147 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Text;
using Microsoft.Win32.SafeHandles;
// stubs for external/corefx/src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
// needed for https://github.com/mono/mono/issues/6766
// or can be implemented via pal_gssapi (see https://github.com/mono/mono/pull/6806)
static partial class Interop
{
static partial class NetSecurityNative
{
internal static void ReleaseGssBuffer (
IntPtr bufferPtr,
UInt64 length) => throw new NotSupportedException ();
internal static Status DisplayMinorStatus (
out Status minorStatus,
Status statusValue,
ref GssBuffer buffer) => throw new NotSupportedException ();
internal static Status DisplayMajorStatus (
out Status minorStatus,
Status statusValue,
ref GssBuffer buffer) => throw new NotSupportedException ();
internal static Status ImportUserName (
out Status minorStatus,
string inputName,
int inputNameByteCount,
out SafeGssNameHandle outputName) => throw new NotSupportedException ();
internal static Status ImportPrincipalName (
out Status minorStatus,
string inputName,
int inputNameByteCount,
out SafeGssNameHandle outputName) => throw new NotSupportedException ();
internal static Status ReleaseName (
out Status minorStatus,
ref IntPtr inputName) => throw new NotSupportedException ();
internal static Status InitiateCredSpNego (
out Status minorStatus,
SafeGssNameHandle desiredName,
out SafeGssCredHandle outputCredHandle) => throw new NotSupportedException ();
internal static Status InitiateCredWithPassword (
out Status minorStatus,
bool isNtlm,
SafeGssNameHandle desiredName,
string password,
int passwordLen,
out SafeGssCredHandle outputCredHandle) => throw new NotSupportedException ();
internal static Status ReleaseCred (
out Status minorStatus,
ref IntPtr credHandle) => throw new NotSupportedException ();
internal static Status InitSecContext (
out Status minorStatus,
SafeGssCredHandle initiatorCredHandle,
ref SafeGssContextHandle contextHandle,
bool isNtlmOnly,
SafeGssNameHandle targetName,
uint reqFlags,
byte[] inputBytes,
int inputLength,
ref GssBuffer token,
out uint retFlags,
out int isNtlmUsed) => throw new NotSupportedException ();
internal static Status AcceptSecContext (
out Status minorStatus,
ref SafeGssContextHandle acceptContextHandle,
byte[] inputBytes,
int inputLength,
ref GssBuffer token) => throw new NotSupportedException ();
internal static Status DeleteSecContext (
out Status minorStatus,
ref IntPtr contextHandle) => throw new NotSupportedException ();
static Status Wrap(
out Status minorStatus,
SafeGssContextHandle contextHandle,
bool isEncrypt,
byte[] inputBytes,
int offset,
int count,
ref GssBuffer outBuffer) => throw new NotSupportedException ();
static Status Unwrap (
out Status minorStatus,
SafeGssContextHandle contextHandle,
byte[] inputBytes,
int offset,
int count,
ref GssBuffer outBuffer) => throw new NotSupportedException ();
internal static Status WrapBuffer (
out Status minorStatus,
SafeGssContextHandle contextHandle,
bool isEncrypt,
byte[] inputBytes,
int offset,
int count,
ref GssBuffer outBuffer) => throw new NotSupportedException ();
internal static Status UnwrapBuffer (
out Status minorStatus,
SafeGssContextHandle contextHandle,
byte[] inputBytes,
int offset,
int count,
ref GssBuffer outBuffer) => throw new NotSupportedException ();
internal enum Status : uint
{
GSS_S_COMPLETE = 0,
GSS_S_CONTINUE_NEEDED = 1
}
[Flags]
internal enum GssFlags : uint
{
GSS_C_DELEG_FLAG = 0x1,
GSS_C_MUTUAL_FLAG = 0x2,
GSS_C_REPLAY_FLAG = 0x4,
GSS_C_SEQUENCE_FLAG = 0x8,
GSS_C_CONF_FLAG = 0x10,
GSS_C_INTEG_FLAG = 0x20,
GSS_C_ANON_FLAG = 0x40,
GSS_C_PROT_READY_FLAG = 0x80,
GSS_C_TRANS_FLAG = 0x100,
GSS_C_DCE_STYLE = 0x1000,
GSS_C_IDENTIFY_FLAG = 0x2000,
GSS_C_EXTENDED_ERROR_FLAG = 0x4000,
GSS_C_DELEG_POLICY_FLAG = 0x8000
}
}
}

View File

@ -124,7 +124,7 @@ namespace MonoTests.System
} catch (DllNotFoundException e) {
return;
}
#if !MONOTOUCH && !XAMMAC
#if !MONOTOUCH && !XAMMAC && !XAMMAC_4_5
// this assumption is incorrect for iOS, tvO, watchOS and OSX
Assert.IsTrue (TimeZoneInfo.Local.Id != "Local", "Local timezone id should not be \"Local\"");
#endif

View File

@ -1 +1 @@
e117a95f92777b26fd2d1298fbce8d3d80e7b11d
22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb

View File

@ -1 +1 @@
88276368473e9573399ca3df2baee284f1215f68
aeaf953be4227f3fa4aed27009a3c61cce142e08

View File

@ -1 +1 @@
ac4327db48f5eb59dbf26f72caa5710e179675cb
521445c1f364c498c2a4a278187fea80c0bc92b7

View File

@ -1 +1 @@
91cac790950b1627448157528f3f8949946c90a0
91d0de0de103bc0ddf25a470b305072cce7006dc

View File

@ -1 +1 @@
4891bd2b96920ca353f0ae80e626100da295715c
4642459db67e852d384e2b69d3bea4ef8137e408

View File

@ -1 +1 @@
956a59b4433bd96d75836cbd1bbac8396bec5050
ac921af4bce9163df2f1a3bd36362db9c48a1003

View File

@ -1 +1 @@
1a7558b1fb4a467c985ec6e856be5afc1a0eb535
befa7b6561e99234f70a32950f98512a4d9c29c8

View File

@ -1 +1 @@
e117a95f92777b26fd2d1298fbce8d3d80e7b11d
22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb

View File

@ -1 +1 @@
88276368473e9573399ca3df2baee284f1215f68
aeaf953be4227f3fa4aed27009a3c61cce142e08

View File

@ -1 +1 @@
ac4327db48f5eb59dbf26f72caa5710e179675cb
521445c1f364c498c2a4a278187fea80c0bc92b7

View File

@ -1 +1 @@
91cac790950b1627448157528f3f8949946c90a0
91d0de0de103bc0ddf25a470b305072cce7006dc

View File

@ -1 +1 @@
4891bd2b96920ca353f0ae80e626100da295715c
4642459db67e852d384e2b69d3bea4ef8137e408

View File

@ -1 +1 @@
956a59b4433bd96d75836cbd1bbac8396bec5050
ac921af4bce9163df2f1a3bd36362db9c48a1003

View File

@ -1 +1 @@
1a7558b1fb4a467c985ec6e856be5afc1a0eb535
befa7b6561e99234f70a32950f98512a4d9c29c8

View File

@ -1 +1 @@
e117a95f92777b26fd2d1298fbce8d3d80e7b11d
22ae2d91b8cb5ad991d6f1a9be89fecbc6ebfceb

View File

@ -1 +1 @@
88276368473e9573399ca3df2baee284f1215f68
aeaf953be4227f3fa4aed27009a3c61cce142e08

View File

@ -1 +1 @@
ac4327db48f5eb59dbf26f72caa5710e179675cb
521445c1f364c498c2a4a278187fea80c0bc92b7

Some files were not shown because too many files have changed in this diff Show More