projects
/
moonshot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove debugging statement
[moonshot.git]
/
mech_eap
/
inquire_sec_context_by_oid.c
diff --git
a/mech_eap/inquire_sec_context_by_oid.c
b/mech_eap/inquire_sec_context_by_oid.c
index
70e923b
..
a69b9e9
100644
(file)
--- a/
mech_eap/inquire_sec_context_by_oid.c
+++ b/
mech_eap/inquire_sec_context_by_oid.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
0
, JANET(UK)
+ * Copyright (c) 201
1
, JANET(UK)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-30,12
+30,16
@@
* SUCH DAMAGE.
*/
* SUCH DAMAGE.
*/
+/*
+ * Return extended properties of a context handle.
+ */
+
#include "gssapiP_eap.h"
static OM_uint32
inquireSessionKey(OM_uint32 *minor,
const gss_ctx_id_t ctx,
#include "gssapiP_eap.h"
static OM_uint32
inquireSessionKey(OM_uint32 *minor,
const gss_ctx_id_t ctx,
- const gss_OID desired_object,
+ const gss_OID desired_object
GSSEAP_UNUSED
,
gss_buffer_set_t *dataSet)
{
OM_uint32 major, tmpMinor;
gss_buffer_set_t *dataSet)
{
OM_uint32 major, tmpMinor;
@@
-43,8
+47,8
@@
inquireSessionKey(OM_uint32 *minor,
gss_buffer_desc buf;
gss_OID_desc oid;
gss_buffer_desc buf;
gss_OID_desc oid;
- buf.length =
ctx->rfc3961Key.length
;
- buf.value =
ctx->rfc3961Key.contents
;
+ buf.length =
KRB_KEY_LENGTH(&ctx->rfc3961Key)
;
+ buf.value =
KRB_KEY_DATA(&ctx->rfc3961Key)
;
major = gss_add_buffer_set_member(minor, &buf, dataSet);
if (GSS_ERROR(major))
major = gss_add_buffer_set_member(minor, &buf, dataSet);
if (GSS_ERROR(major))
@@
-69,6
+73,7
@@
inquireSessionKey(OM_uint32 *minor,
goto cleanup;
major = GSS_S_COMPLETE;
goto cleanup;
major = GSS_S_COMPLETE;
+ *minor = 0;
cleanup:
if (GSS_ERROR(major) && *dataSet != GSS_C_NO_BUFFER_SET) {
cleanup:
if (GSS_ERROR(major) && *dataSet != GSS_C_NO_BUFFER_SET) {
@@
-92,26
+97,45
@@
static struct {
{ 11, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05" },
inquireSessionKey
},
{ 11, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05" },
inquireSessionKey
},
+ {
+ /* GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT + v1 */
+ { 12, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x06\x01" },
+ gssEapExportLucidSecContext
+ },
};
OM_uint32
gss_inquire_sec_context_by_oid(OM_uint32 *minor,
};
OM_uint32
gss_inquire_sec_context_by_oid(OM_uint32 *minor,
- const gss_ctx_id_t c
ontext_handle
,
+ const gss_ctx_id_t c
tx
,
const gss_OID desired_object,
gss_buffer_set_t *data_set)
{
const gss_OID desired_object,
gss_buffer_set_t *data_set)
{
- OM_uint32 major
= GSS_S_UNAVAILABLE
;
+ OM_uint32 major;
int i;
*data_set = GSS_C_NO_BUFFER_SET;
int i;
*data_set = GSS_C_NO_BUFFER_SET;
+ GSSEAP_MUTEX_LOCK(&ctx->mutex);
+
+ if (!CTX_IS_ESTABLISHED(ctx)) {
+ *minor = GSSEAP_CONTEXT_INCOMPLETE;
+ major = GSS_S_NO_CONTEXT;
+ goto cleanup;
+ }
+
+ major = GSS_S_UNAVAILABLE;
+ *minor = GSSEAP_BAD_CONTEXT_OPTION;
+
for (i = 0; i < sizeof(inquireCtxOps) / sizeof(inquireCtxOps[0]); i++) {
if (oidEqual(&inquireCtxOps[i].oid, desired_object)) {
for (i = 0; i < sizeof(inquireCtxOps) / sizeof(inquireCtxOps[0]); i++) {
if (oidEqual(&inquireCtxOps[i].oid, desired_object)) {
- major = (*inquireCtxOps[i].inquire)(minor, c
ontext_handle
,
+ major = (*inquireCtxOps[i].inquire)(minor, c
tx
,
desired_object, data_set);
break;
}
}
desired_object, data_set);
break;
}
}
+cleanup:
+ GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+
return major;
}
return major;
}