projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for Heimdal (macOS) builds from Stefan.
[mech_eap.git]
/
mech_eap
/
export_sec_context.c
diff --git
a/mech_eap/export_sec_context.c
b/mech_eap/export_sec_context.c
index
e5be6d8
..
3b74366
100644
(file)
--- a/
mech_eap/export_sec_context.c
+++ b/
mech_eap/export_sec_context.c
@@
-121,6
+121,11
@@
gssEapExportSecContext(OM_uint32 *minor,
key.length = KRB_KEY_LENGTH(&ctx->rfc3961Key);
key.value = KRB_KEY_DATA(&ctx->rfc3961Key);
key.length = KRB_KEY_LENGTH(&ctx->rfc3961Key);
key.value = KRB_KEY_DATA(&ctx->rfc3961Key);
+ /*
+ * As a shortcut, we omit the mechanism OID of the initiator name because
+ * we know it will match the context mechanism. The acceptor name mech OID
+ * is always included.
+ */
if (ctx->initiatorName != GSS_C_NO_NAME) {
major = gssEapExportNameInternal(minor, ctx->initiatorName,
&initiatorName,
if (ctx->initiatorName != GSS_C_NO_NAME) {
major = gssEapExportNameInternal(minor, ctx->initiatorName,
&initiatorName,
@@
-132,7
+137,7
@@
gssEapExportSecContext(OM_uint32 *minor,
if (ctx->acceptorName != GSS_C_NO_NAME) {
major = gssEapExportNameInternal(minor, ctx->acceptorName,
&acceptorName,
if (ctx->acceptorName != GSS_C_NO_NAME) {
major = gssEapExportNameInternal(minor, ctx->acceptorName,
&acceptorName,
- EXPORT_NAME_FLAG_COMPOSITE);
+ EXPORT_NAME_FLAG_
OID | EXPORT_NAME_FLAG_
COMPOSITE);
if (GSS_ERROR(major))
goto cleanup;
}
if (GSS_ERROR(major))
goto cleanup;
}