Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

NegotiateStream Tests on Unix #6139

Merged
kapilash merged 1 commit into from
Feb 25, 2016
Merged

NegotiateStream Tests on Unix #6139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/Common/src/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,14 @@ internal static extern Status InitSecContext(
ref GssBuffer token,
out uint retFlags);

[DllImport(Interop.Libraries.NetSecurityNative, EntryPoint="NetSecurityNative_AcceptSecContext")]
internal static extern Status AcceptSecContext(
out Status minorStatus,
ref SafeGssContextHandle acceptContextHandle,
byte[] inputBytes,
int inputLength,
ref GssBuffer token);

[DllImport(Interop.Libraries.NetSecurityNative, EntryPoint="NetSecurityNative_DeleteSecContext")]
internal static extern Status DeleteSecContext(
out Status minorStatus,
Expand Down
65 changes: 45 additions & 20 deletions src/Native/System.Net.Security.Native/pal_gssapi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ static uint32_t NetSecurityNative_AcquireCredSpNego(uint32_t* minorStatus,
minorStatus, desiredName, 0, &gss_mech_spnego_OID_set_desc, credUsage, outputCredHandle, nullptr, nullptr);
}

extern "C" uint32_t NetSecurityNative_InitiateCredSpNego(uint32_t* minorStatus,
GssName* desiredName,
GssCredId** outputCredHandle)
extern "C" uint32_t
NetSecurityNative_InitiateCredSpNego(uint32_t* minorStatus, GssName* desiredName, GssCredId** outputCredHandle)
{
return NetSecurityNative_AcquireCredSpNego(minorStatus, desiredName, GSS_C_INITIATE, outputCredHandle);
}
Expand All @@ -94,7 +93,7 @@ extern "C" uint32_t NetSecurityNative_DisplayStatus(uint32_t* minorStatus,

int statusType = isGssMechCode ? GSS_C_MECH_CODE : GSS_C_GSS_CODE;
uint32_t messageContext;
GssBuffer gssBuffer {.length = 0, .value = nullptr};
GssBuffer gssBuffer{.length = 0, .value = nullptr};
uint32_t majorStatus =
gss_display_status(minorStatus, statusValue, statusType, GSS_C_NO_OID, &messageContext, &gssBuffer);

Expand Down Expand Up @@ -146,9 +145,9 @@ extern "C" uint32_t NetSecurityNative_InitSecContext(uint32_t* minorStatus,
assert(contextHandle != nullptr);
assert(outBuffer != nullptr);
assert(retFlags != nullptr);
assert (inputBytes != nullptr || inputLength == 0);
assert(inputBytes != nullptr || inputLength == 0);

//Note: claimantCredHandle can be null
// Note: claimantCredHandle can be null

#if HAVE_GSS_SPNEGO_MECHANISM
gss_OID desiredMech = isNtlm ? GSS_NTLM_MECHANISM : GSS_SPNEGO_MECHANISM;
Expand All @@ -160,8 +159,8 @@ extern "C" uint32_t NetSecurityNative_InitSecContext(uint32_t* minorStatus,
gss_OID desiredMech = &gss_mech_spnego_OID_desc;
#endif

GssBuffer inputToken {.length = UnsignedCast(inputLength), .value = inputBytes};
GssBuffer gssBuffer { .length = 0, .value = nullptr };
GssBuffer inputToken{.length = UnsignedCast(inputLength), .value = inputBytes};
GssBuffer gssBuffer{.length = 0, .value = nullptr};

uint32_t majorStatus = gss_init_sec_context(minorStatus,
claimantCredHandle,
Expand All @@ -180,6 +179,35 @@ extern "C" uint32_t NetSecurityNative_InitSecContext(uint32_t* minorStatus,
return NetSecurityNative_HandleError(majorStatus, &gssBuffer, outBuffer);
}

extern "C" uint32_t NetSecurityNative_AcceptSecContext(uint32_t* minorStatus,
GssCtxId** contextHandle,
uint8_t* inputBytes,
uint32_t inputLength,
struct PAL_GssBuffer* outBuffer)
{
assert(minorStatus != nullptr);
assert(contextHandle != nullptr);
assert(outBuffer != nullptr);
assert(inputBytes != nullptr || inputLength == 0);

GssBuffer inputToken{.length = UnsignedCast(inputLength), .value = inputBytes};
GssBuffer gssBuffer{.length = 0, .value = nullptr};

uint32_t majorStatus = gss_accept_sec_context(minorStatus,
contextHandle,
GSS_C_NO_CREDENTIAL,
&inputToken,
GSS_C_NO_CHANNEL_BINDINGS,
nullptr,
nullptr,
&gssBuffer,
0,
nullptr,
nullptr);

return NetSecurityNative_HandleError(majorStatus, &gssBuffer, outBuffer);
}

extern "C" uint32_t NetSecurityNative_ReleaseCred(uint32_t* minorStatus, GssCredId** credHandle)
{
assert(minorStatus != nullptr);
Expand All @@ -193,7 +221,7 @@ extern "C" void NetSecurityNative_ReleaseGssBuffer(void* buffer, uint64_t length
assert(buffer != nullptr);

uint32_t minorStatus;
GssBuffer gssBuffer {.length = length, .value = buffer};
GssBuffer gssBuffer{.length = length, .value = buffer};
gss_release_buffer(&minorStatus, &gssBuffer);
}

Expand Down Expand Up @@ -227,8 +255,8 @@ extern "C" uint32_t NetSecurityNative_Wrap(uint32_t* minorStatus,
int confState;
GssBuffer inputMessageBuffer{.length = UnsignedCast(count), .value = inputBytes + offset};
GssBuffer gssBuffer;
uint32_t majorStatus = gss_wrap(
minorStatus, contextHandle, isEncrypt, GSS_C_QOP_DEFAULT, &inputMessageBuffer, &confState, &gssBuffer);
uint32_t majorStatus =
gss_wrap(minorStatus, contextHandle, isEncrypt, GSS_C_QOP_DEFAULT, &inputMessageBuffer, &confState, &gssBuffer);
return NetSecurityNative_HandleError(majorStatus, &gssBuffer, outBuffer);
}

Expand All @@ -249,9 +277,8 @@ extern "C" uint32_t NetSecurityNative_Unwrap(uint32_t* minorStatus,
// count refers to the length of the input message. That is, the number of bytes of inputBytes
// starting at offset that need to be wrapped.
GssBuffer inputMessageBuffer{.length = UnsignedCast(count), .value = inputBytes + offset};
GssBuffer gssBuffer {.length = 0, .value = nullptr};
uint32_t majorStatus =
gss_unwrap(minorStatus, contextHandle, &inputMessageBuffer, &gssBuffer, nullptr, nullptr);
GssBuffer gssBuffer{.length = 0, .value = nullptr};
uint32_t majorStatus = gss_unwrap(minorStatus, contextHandle, &inputMessageBuffer, &gssBuffer, nullptr, nullptr);
return NetSecurityNative_HandleError(majorStatus, &gssBuffer, outBuffer);
}

Expand All @@ -272,11 +299,9 @@ static uint32_t NetSecurityNative_AcquireCredWithPassword(uint32_t* minorStatus,
minorStatus, desiredName, &passwordBuffer, 0, nullptr, credUsage, outputCredHandle, nullptr, nullptr);
}

extern "C" uint32_t NetSecurityNative_InitiateCredWithPassword(uint32_t* minorStatus,
GssName* desiredName,
char* password,
uint32_t passwdLen,
GssCredId** outputCredHandle)
extern "C" uint32_t NetSecurityNative_InitiateCredWithPassword(
uint32_t* minorStatus, GssName* desiredName, char* password, uint32_t passwdLen, GssCredId** outputCredHandle)
{
return NetSecurityNative_AcquireCredWithPassword(minorStatus, desiredName, password, passwdLen, GSS_C_INITIATE, outputCredHandle);
return NetSecurityNative_AcquireCredWithPassword(
minorStatus, desiredName, password, passwdLen, GSS_C_INITIATE, outputCredHandle);
}
22 changes: 14 additions & 8 deletions src/Native/System.Net.Security.Native/pal_gssapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,8 @@ extern "C" uint32_t NetSecurityNative_ReleaseName(uint32_t* minorStatus, GssName
/*
Shims the gss_acquire_cred method with SPNEGO oids with GSS_C_INITIATE
*/
extern "C" uint32_t NetSecurityNative_InitiateCredSpNego(uint32_t* minorStatus,
GssName* desiredName,
GssCredId** outputCredHandle);
extern "C" uint32_t
NetSecurityNative_InitiateCredSpNego(uint32_t* minorStatus, GssName* desiredName, GssCredId** outputCredHandle);

/*
Shims the gss_release_cred method.
Expand All @@ -104,6 +103,16 @@ extern "C" uint32_t NetSecurityNative_InitSecContext(uint32_t* minorStatus,
uint32_t* retFlags);

/*
Shims the gss_accept_sec_context method
*/
extern "C" uint32_t NetSecurityNative_AcceptSecContext(uint32_t* minorStatus,
GssCtxId** contextHandle,
uint8_t* inputBytes,
uint32_t inputLength,
struct PAL_GssBuffer* outBuffer);

/*

Copy link
Copy Markdown
Member

@stephentoub stephentoub Feb 17, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: similar formatting nits, e.g. blank line, function arguments not aligned, etc.

Shims the gss_delete_sec_context method.
*/
extern "C" uint32_t NetSecurityNative_DeleteSecContext(uint32_t* minorStatus, GssCtxId** contextHandle);
Expand Down Expand Up @@ -132,8 +141,5 @@ extern "C" uint32_t NetSecurityNative_Unwrap(uint32_t* minorStatus,
/*
Shims the gss_acquire_cred_with_password method with GSS_C_INITIATE
*/
extern "C" uint32_t NetSecurityNative_InitiateCredWithPassword(uint32_t* minorStatus,
GssName* desiredName,
char* password,
uint32_t passwdLen,
GssCredId** outputCredHandle);
extern "C" uint32_t NetSecurityNative_InitiateCredWithPassword(
uint32_t* minorStatus, GssName* desiredName, char* password, uint32_t passwdLen, GssCredId** outputCredHandle);
Loading