From: Tom Yu Date: Sun, 24 May 2009 22:50:44 +0000 (+0000) Subject: pull up r22351, r22354 from trunk X-Git-Tag: krb5-1.7-beta3~13 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=fb5ee2d640a0861bb5ea52bd68111ad6d5fc692c;p=krb5.git pull up r22351, r22354 from trunk ------------------------------------------------------------------------ r22354 | hartmans | 2009-05-18 21:08:48 +0200 (Mon, 18 May 2009) | 8 lines ticket: 6488 target_version: 1.7 tags: pullup Copy the sequence key rather than the subkey for lucid contexts in RFC 1964 mode, so that we map to raw des enctypes rather than say des-cbc-crc. ------------------------------------------------------------------------ r22351 | ghudson | 2009-05-14 18:50:52 +0200 (Thu, 14 May 2009) | 9 lines ticket: 6488 status: open tags: pullup target_version: 1.7 gss_krb5int_export_lucid_sec_context was erroneously copying the first sizeof(void *) bytes of the context into data_set, instead of the pointer to the context. ticket: 6488 version_fixed: 1.7 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22373 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/gssapi/krb5/lucid_context.c b/src/lib/gssapi/krb5/lucid_context.c index 32b0e13f7..cefac261e 100644 --- a/src/lib/gssapi/krb5/lucid_context.c +++ b/src/lib/gssapi/krb5/lucid_context.c @@ -107,7 +107,7 @@ gss_krb5int_export_lucid_sec_context( goto error_out; } - rep.value = lctx; + rep.value = &lctx; rep.length = sizeof(lctx); retval = generic_gss_add_buffer_set_member(minor_status, &rep, data_set); @@ -213,7 +213,7 @@ make_external_lucid_ctx_v1( lctx->rfc1964_kd.sign_alg = gctx->signalg; lctx->rfc1964_kd.seal_alg = gctx->sealalg; /* Copy key */ - if ((retval = copy_keyblock_to_lucid_key(gctx->subkey, + if ((retval = copy_keyblock_to_lucid_key(gctx->seq, &lctx->rfc1964_kd.ctx_key))) goto error_out; }