svn rev #23830: branches/krb5-1-8/src/include/ krb5/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=23830
Commit By: tlyu
Log Message:
ticket: 6689
version_fixed: 1.8.1
status: resolved

pull up r23829 from trunk

 ------------------------------------------------------------------------
 r23829 | tlyu | 2010-03-22 23:09:02 -0700 (Mon, 22 Mar 2010) | 10 lines

 ticket: 6689
 target_version: 1.8.1
 tags: pullup
 subject: krb5_typed_data not castable to krb5_pa_data on 64-bit MacOSX

 Move krb5_typed_data to krb5.hin from k5-int-pkinit.h because
 krb5int_fast_process_error was assuming that it was safe to cast it to
 krb5_pa_data.  It's not safe to do the cast on 64-bit MacOSX because
 krb5.hin uses #pragma pack on that platform.


Changed Files:
U   branches/krb5-1-8/src/include/k5-int-pkinit.h
U   branches/krb5-1-8/src/include/krb5/krb5.hin
Modified: branches/krb5-1-8/src/include/k5-int-pkinit.h
===================================================================
--- branches/krb5-1-8/src/include/k5-int-pkinit.h	2010-03-23 06:09:02 UTC (rev 23829)
+++ branches/krb5-1-8/src/include/k5-int-pkinit.h	2010-03-23 07:21:04 UTC (rev 23830)
@@ -101,17 +101,6 @@
     } u;
 } krb5_trusted_ca;
 
-/* typed data */
-/* The FAST error handling logic currently assumes that this structure  and krb5_pa_data * can be safely cast to each other
- * if this structure changes, that code needs to be updated to copy.
- */
-typedef struct _krb5_typed_data {
-    krb5_magic magic;
-    krb5_int32  type;
-    unsigned int length;
-    krb5_octet *data;
-} krb5_typed_data;
-
 /* PA-PK-AS-REQ (Draft 9 -- PA TYPE 14) */
 typedef struct _krb5_pa_pk_as_req_draft9 {
     krb5_octet_data signedAuthPack;

Modified: branches/krb5-1-8/src/include/krb5/krb5.hin
===================================================================
--- branches/krb5-1-8/src/include/krb5/krb5.hin	2010-03-23 06:09:02 UTC (rev 23829)
+++ branches/krb5-1-8/src/include/krb5/krb5.hin	2010-03-23 07:21:04 UTC (rev 23830)
@@ -1184,6 +1184,19 @@
     krb5_octet *contents;
 } krb5_pa_data;
 
+/* typed data */
+/*
+ * The FAST error handling logic currently assumes that this structure and
+ * krb5_pa_data * can be safely cast to each other if this structure changes,
+ * that code needs to be updated to copy.
+ */
+typedef struct _krb5_typed_data {
+    krb5_magic magic;
+    krb5_int32  type;
+    unsigned int length;
+    krb5_octet *data;
+} krb5_typed_data;
+
 typedef struct _krb5_kdc_req {
     krb5_magic magic;
     krb5_msgtype msg_type;              /* AS_REQ or TGS_REQ? */