svn rev #24022: users/lhoward/camellia-ccm/src/lib/krb5/ccache/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24022
Commit By: ghudson
Log Message:
Pull up r24021 (fix negative enctypes in ccaches) to Luke's
camellia-ccm branch for testing purposes.



Changed Files:
U   users/lhoward/camellia-ccm/src/lib/krb5/ccache/cc_file.c
Modified: users/lhoward/camellia-ccm/src/lib/krb5/ccache/cc_file.c
===================================================================
--- users/lhoward/camellia-ccm/src/lib/krb5/ccache/cc_file.c	2010-05-13 18:58:43 UTC (rev 24021)
+++ users/lhoward/camellia-ccm/src/lib/krb5/ccache/cc_file.c	2010-05-13 19:02:48 UTC (rev 24022)
@@ -595,8 +595,9 @@
     keyblock->magic = KV5M_KEYBLOCK;
     keyblock->contents = 0;
 
+    /* Enctype is signed, so sign-extend the 16-bit value we read. */
     kret = krb5_fcc_read_ui_2(context, id, &ui2);
-    keyblock->enctype = ui2;
+    keyblock->enctype = (krb5_int16) ui2;
     CHECK(kret);
     if (data->version == KRB5_FCC_FVNO_3) {
         /* This works because the old etype is the same as the new enctype. */