Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1c0b32b
from prototype
VSadov Nov 12, 2020
4adfaa6
fix OSX
VSadov Nov 12, 2020
0facc65
fix for Android
VSadov Nov 16, 2020
a2ab07c
treat "libSystem.Globalization.Native" as QCall in mono too (for now).
VSadov Nov 17, 2020
2b2f800
fix for wasm
VSadov Nov 19, 2020
8c4e514
current
VSadov Nov 20, 2020
6e584b4
remove no longer needed hacks
VSadov Nov 20, 2020
ba71464
Undo confusing changes for now
VSadov Nov 20, 2020
4563d69
fix pedantic errors on GCC
VSadov Nov 20, 2020
51281d6
delete gPalGlobalizationNative
VSadov Nov 21, 2020
25369f4
pass overrider from the host
VSadov Nov 21, 2020
e6fca93
default override
VSadov Nov 21, 2020
c11612f
default PInvoke override runs after optional host-provided overrider.
VSadov Nov 23, 2020
d3f4abe
Some PR feedback (mostly related to code, not the CMake stuff).
VSadov Nov 25, 2020
79453c7
more coding PR feedback
VSadov Dec 1, 2020
becda0e
Deleted "libraries-native" folder.
VSadov Dec 1, 2020
932b5fe
unifying tryrun.cmake into 1 common file
VSadov Dec 2, 2020
3f5cea9
factor out adding lib-specific dependencies into one place (per nativ…
VSadov Dec 3, 2020
8d2b6b9
cleanup: entirely remove tryrun.cmake propagation in eng, gen-buildsy…
VSadov Dec 3, 2020
9b7476f
remove "clrcompression.dll" and "libSystem.IO.Compression.Native.dyli…
VSadov Dec 3, 2020
8a02254
mono: refactor Globalization lookup into `default_resolve_dllimport`.
VSadov Dec 3, 2020
f22e9fd
set FEATURE_DISTRO_AGNOSTIC_SSL according to __PortableBuild
VSadov Dec 3, 2020
e539a1a
CORECLR_CALLING_CONVENTION for the host callback types
VSadov Dec 3, 2020
06dad00
revert change in pal_gssapi.h
VSadov Dec 3, 2020
ac026ba
keep the #include "pal_config.h"
VSadov Dec 4, 2020
eb62c4a
refactor common parts of entrypoints.c into entrypoints.h
VSadov Dec 4, 2020
2f45a47
rename OverrideEntry --> DllImportEntry
VSadov Dec 4, 2020
7b2bdef
extra libs as CMake functions
VSadov Dec 4, 2020
7ab3211
use macros instead of functions in extra_libs.cmake
VSadov Dec 4, 2020
7bf0a63
mono formatting style in src/mono/mono/metadata/native-library.c
VSadov Dec 4, 2020
d3a15fa
mono: Remaining stylistic nits.
VSadov Dec 4, 2020
6c55b68
do not set DFEATURE_DISTRO_AGNOSTIC_SSL on iOS, Android, tvOS
VSadov Dec 7, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert change in pal_gssapi.h
  • Loading branch information
VSadov committed Dec 5, 2020
commit 06dad0020d0c8d7387ee115a255314fefc4261ae
99 changes: 49 additions & 50 deletions src/libraries/Native/Unix/System.Net.Security.Native/pal_gssapi.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.

#pragma once
#include "pal_config.h"
#include "pal_compiler.h"

#if HAVE_GSSFW_HEADERS || HAVE_HEIMDAL_HEADERS
Expand Down Expand Up @@ -80,9 +79,9 @@ NetSecurityNative_ImportUserName(uint32_t* minorStatus, char* inputName, uint32_
Shims the gss_import_name method with nametype = GSS_C_NT_USER_NAME.
*/
PALEXPORT uint32_t NetSecurityNative_ImportPrincipalName(uint32_t* minorStatus,
char* inputName,
uint32_t inputNameLen,
GssName** outputName);
char* inputName,
uint32_t inputNameLen,
GssName** outputName);

/*
Shims the gss_release_name method.
Expand All @@ -109,42 +108,42 @@ PALEXPORT uint32_t NetSecurityNative_ReleaseCred(uint32_t* minorStatus, GssCredI
Shims the gss_init_sec_context method with SPNEGO oids.
*/
PALEXPORT uint32_t NetSecurityNative_InitSecContext(uint32_t* minorStatus,
GssCredId* claimantCredHandle,
GssCtxId** contextHandle,
uint32_t isNtlm,
GssName* targetName,
uint32_t reqFlags,
uint8_t* inputBytes,
uint32_t inputLength,
PAL_GssBuffer* outBuffer,
uint32_t* retFlags,
int32_t* isNtlmUsed);
GssCredId* claimantCredHandle,
GssCtxId** contextHandle,
uint32_t isNtlm,
GssName* targetName,
uint32_t reqFlags,
uint8_t* inputBytes,
uint32_t inputLength,
PAL_GssBuffer* outBuffer,
uint32_t* retFlags,
int32_t* isNtlmUsed);

PALEXPORT uint32_t NetSecurityNative_InitSecContextEx(uint32_t* minorStatus,
GssCredId* claimantCredHandle,
GssCtxId** contextHandle,
uint32_t isNtlm,
void* cbt,
int32_t cbtSize,
GssName* targetName,
uint32_t reqFlags,
uint8_t* inputBytes,
uint32_t inputLength,
PAL_GssBuffer* outBuffer,
uint32_t* retFlags,
int32_t* isNtlmUsed);
GssCredId* claimantCredHandle,
GssCtxId** contextHandle,
uint32_t isNtlm,
void* cbt,
int32_t cbtSize,
GssName* targetName,
uint32_t reqFlags,
uint8_t* inputBytes,
uint32_t inputLength,
PAL_GssBuffer* outBuffer,
uint32_t* retFlags,
int32_t* isNtlmUsed);

/*
Shims the gss_accept_sec_context method.
*/
PALEXPORT uint32_t NetSecurityNative_AcceptSecContext(uint32_t* minorStatus,
GssCredId* acceptorCredHandle,
GssCtxId** contextHandle,
uint8_t* inputBytes,
uint32_t inputLength,
PAL_GssBuffer* outBuffer,
uint32_t* retFlags,
int32_t* isNtlmUsed);
GssCredId* acceptorCredHandle,
GssCtxId** contextHandle,
uint8_t* inputBytes,
uint32_t inputLength,
PAL_GssBuffer* outBuffer,
uint32_t* retFlags,
int32_t* isNtlmUsed);

/*

Expand All @@ -156,31 +155,31 @@ PALEXPORT uint32_t NetSecurityNative_DeleteSecContext(uint32_t* minorStatus, Gss
Shims the gss_wrap method.
*/
PALEXPORT uint32_t NetSecurityNative_Wrap(uint32_t* minorStatus,
GssCtxId* contextHandle,
int32_t isEncrypt,
uint8_t* inputBytes,
int32_t count,
PAL_GssBuffer* outBuffer);
GssCtxId* contextHandle,
int32_t isEncrypt,
uint8_t* inputBytes,
int32_t count,
PAL_GssBuffer* outBuffer);

/*
Shims the gss_unwrap method.
*/
PALEXPORT uint32_t NetSecurityNative_Unwrap(uint32_t* minorStatus,
GssCtxId* contextHandle,
uint8_t* inputBytes,
int32_t offset,
int32_t count,
PAL_GssBuffer* outBuffer);
GssCtxId* contextHandle,
uint8_t* inputBytes,
int32_t offset,
int32_t count,
PAL_GssBuffer* outBuffer);

/*
Shims the gss_acquire_cred_with_password method with GSS_C_INITIATE.
*/
PALEXPORT uint32_t NetSecurityNative_InitiateCredWithPassword(uint32_t* minorStatus,
int32_t isNtlm,
GssName* desiredName,
char* password,
uint32_t passwdLen,
GssCredId** outputCredHandle);
int32_t isNtlm,
GssName* desiredName,
char* password,
uint32_t passwdLen,
GssCredId** outputCredHandle);

/*
Shims the gss_indicate_mechs method to detect if NTLM mech is installed.
Expand All @@ -191,5 +190,5 @@ PALEXPORT uint32_t NetSecurityNative_IsNtlmInstalled(void);
Shims gss_inquire_context and gss_display_name to get the remote user principal name.
*/
PALEXPORT uint32_t NetSecurityNative_GetUser(uint32_t* minorStatus,
GssCtxId* contextHandle,
PAL_GssBuffer* outBuffer);
GssCtxId* contextHandle,
PAL_GssBuffer* outBuffer);