#include "smb_krb5.h"
#include "gse_krb5.h"
+#ifndef GSS_C_DCE_STYLE
+#define GSS_C_DCE_STYLE 0x1000
+#endif
+
#ifndef GSS_KRB5_INQ_SSPI_SESSION_KEY_OID
#define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID_LENGTH 11
#define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05"
krb5_ccache ccache;
krb5_keytab keytab;
- gss_ctx_id_t gss_ctx;
+ gss_ctx_id_t gssapi_context;
gss_OID_desc gss_mech;
OM_uint32 gss_c_flags;
gss_OID ret_mech;
OM_uint32 ret_flags;
- gss_cred_id_t delegated_creds;
+ gss_cred_id_t delegated_cred_handle;
gss_name_t client_name;
bool more_processing;
krb5_free_context(gse_ctx->k5ctx);
gse_ctx->k5ctx = NULL;
}
- if (gse_ctx->gss_ctx != GSS_C_NO_CONTEXT) {
+ if (gse_ctx->gssapi_context != GSS_C_NO_CONTEXT) {
gss_maj = gss_delete_sec_context(&gss_min,
- &gse_ctx->gss_ctx,
+ &gse_ctx->gssapi_context,
GSS_C_NO_BUFFER);
}
if (gse_ctx->server_name) {
gss_maj = gss_release_cred(&gss_min,
&gse_ctx->creds);
}
- if (gse_ctx->delegated_creds) {
+ if (gse_ctx->delegated_cred_handle) {
gss_maj = gss_release_cred(&gss_min,
- &gse_ctx->delegated_creds);
+ &gse_ctx->delegated_cred_handle);
}
/* MIT and Heimdal differ as to if you can call
gss_maj = gss_init_sec_context(&gss_min,
gse_ctx->creds,
- &gse_ctx->gss_ctx,
+ &gse_ctx->gssapi_context,
gse_ctx->server_name,
&gse_ctx->gss_mech,
gse_ctx->gss_c_flags,
in_data.length = token_in->length;
gss_maj = gss_accept_sec_context(&gss_min,
- &gse_ctx->gss_ctx,
+ &gse_ctx->gssapi_context,
gse_ctx->creds,
&in_data,
GSS_C_NO_CHANNEL_BINDINGS,
&gse_ctx->ret_mech,
&out_data,
&gse_ctx->ret_flags, NULL,
- &gse_ctx->delegated_creds);
+ &gse_ctx->delegated_cred_handle);
switch (gss_maj) {
case GSS_S_COMPLETE:
/* we are done with it */
DEBUG(0, ("gss_init_sec_context failed with [%s]\n",
gse_errstr(talloc_tos(), gss_maj, gss_min)));
- if (gse_ctx->gss_ctx) {
+ if (gse_ctx->gssapi_context) {
gss_delete_sec_context(&gss_min,
- &gse_ctx->gss_ctx,
+ &gse_ctx->gssapi_context,
GSS_C_NO_BUFFER);
}
DATA_BLOB ret;
gss_maj = gss_inquire_sec_context_by_oid(
- &gss_min, gse_ctx->gss_ctx,
+ &gss_min, gse_ctx->gssapi_context,
&gse_sesskey_inq_oid, &set);
if (gss_maj) {
DEBUG(0, ("gss_inquire_sec_context_by_oid failed [%s]\n",
#ifdef HAVE_GSSKRB5_GET_SUBKEY
krb5_keyblock *subkey;
gss_maj = gsskrb5_get_subkey(&gss_min,
- gse_ctx->gss_ctx,
+ gse_ctx->gssapi_context,
&subkey);
if (gss_maj != 0) {
DEBUG(1, ("NO session key for this mech\n"));
}
static size_t gse_get_signature_length(struct gse_context *gse_ctx,
- int seal, size_t payload_size)
+ bool seal, size_t payload_size)
{
OM_uint32 gss_min, gss_maj;
gss_iov_buffer_desc iov[2];
- uint8_t fakebuf[payload_size];
int sealed;
+ /*
+ * gss_wrap_iov_length() only needs the type and length
+ */
iov[0].type = GSS_IOV_BUFFER_TYPE_HEADER;
iov[0].buffer.value = NULL;
iov[0].buffer.length = 0;
iov[1].type = GSS_IOV_BUFFER_TYPE_DATA;
- iov[1].buffer.value = fakebuf;
+ iov[1].buffer.value = NULL;
iov[1].buffer.length = payload_size;
- gss_maj = gss_wrap_iov_length(&gss_min, gse_ctx->gss_ctx,
+ gss_maj = gss_wrap_iov_length(&gss_min, gse_ctx->gssapi_context,
seal, GSS_C_QOP_DEFAULT,
&sealed, iov, 2);
if (gss_maj) {
NTSTATUS status;
/* allocate the memory ourselves so we do not need to talloc_memdup */
- signature->length = gse_get_signature_length(gse_ctx, 1, data->length);
+ signature->length = gse_get_signature_length(gse_ctx, true, data->length);
if (!signature->length) {
return NT_STATUS_INTERNAL_ERROR;
}
iov[1].buffer.value = data->data;
iov[1].buffer.length = data->length;
- gss_maj = gss_wrap_iov(&gss_min, gse_ctx->gss_ctx,
+ gss_maj = gss_wrap_iov(&gss_min, gse_ctx->gssapi_context,
req_seal, GSS_C_QOP_DEFAULT,
&sealed, iov, 2);
if (gss_maj) {
iov[1].buffer.value = data->data;
iov[1].buffer.length = data->length;
- gss_maj = gss_unwrap_iov(&gss_min, gse_ctx->gss_ctx,
+ gss_maj = gss_unwrap_iov(&gss_min, gse_ctx->gssapi_context,
&sealed, NULL, iov, 2);
if (gss_maj) {
DEBUG(0, ("gss_unwrap_iov failed with [%s]\n",
in_data.value = data->data;
in_data.length = data->length;
- gss_maj = gss_get_mic(&gss_min, gse_ctx->gss_ctx,
+ gss_maj = gss_get_mic(&gss_min, gse_ctx->gssapi_context,
GSS_C_QOP_DEFAULT,
&in_data, &out_data);
if (gss_maj) {
in_token.value = signature->data;
in_token.length = signature->length;
- gss_maj = gss_verify_mic(&gss_min, gse_ctx->gss_ctx,
+ gss_maj = gss_verify_mic(&gss_min, gse_ctx->gssapi_context,
&in_data, &in_token, NULL);
if (gss_maj) {
DEBUG(0, ("gss_verify_mic failed with [%s]\n",
input_token.value = in->data;
maj_stat = gss_wrap(&min_stat,
- gse_ctx->gss_ctx,
+ gse_ctx->gssapi_context,
gensec_have_feature(gensec_security, GENSEC_FEATURE_SEAL),
GSS_C_QOP_DEFAULT,
&input_token,
input_token.value = in->data;
maj_stat = gss_unwrap(&min_stat,
- gse_ctx->gss_ctx,
+ gse_ctx->gssapi_context,
&input_token,
&output_token,
&conf_state,
return NT_STATUS_NO_MEMORY;
}
- nt_status = gssapi_obtain_pac_blob(tmp_ctx, gse_ctx->gss_ctx,
+ nt_status = gssapi_obtain_pac_blob(tmp_ctx, gse_ctx->gssapi_context,
gse_ctx->client_name,
&pac_blob);