svn rev #22373: branches/krb5-1-7/src/lib/gssapi/krb5/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22373
Commit By: tlyu
Log Message:
ticket: 6488
version_fixed: 1.7

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.


Changed Files:
U   branches/krb5-1-7/src/lib/gssapi/krb5/lucid_context.c
Modified: branches/krb5-1-7/src/lib/gssapi/krb5/lucid_context.c
===================================================================
--- branches/krb5-1-7/src/lib/gssapi/krb5/lucid_context.c	2009-05-24 22:50:30 UTC (rev 22372)
+++ branches/krb5-1-7/src/lib/gssapi/krb5/lucid_context.c	2009-05-24 22:50:44 UTC (rev 22373)
@@ -107,7 +107,7 @@
         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 @@
         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;
     }