summaryrefslogtreecommitdiffstats
path: root/src/include/krb5
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2010-03-23 06:09:02 +0000
committerTom Yu <tlyu@mit.edu>2010-03-23 06:09:02 +0000
commit1085c316471a8ec60ae0693ba8b964b03b2b660f (patch)
tree66ef868a29b28b02dde75e81cfeefe5f6c8d8f07 /src/include/krb5
parent5321c69e3306febb2c8021119916b46aed8ef5e5 (diff)
downloadkrb5-1085c316471a8ec60ae0693ba8b964b03b2b660f.tar.gz
krb5-1085c316471a8ec60ae0693ba8b964b03b2b660f.tar.xz
krb5-1085c316471a8ec60ae0693ba8b964b03b2b660f.zip
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. ticket: 6689 target_version: 1.8.1 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23829 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/krb5')
-rw-r--r--src/include/krb5/krb5.hin13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/include/krb5/krb5.hin b/src/include/krb5/krb5.hin
index 875d14a60..d9f3ba864 100644
--- a/src/include/krb5/krb5.hin
+++ b/src/include/krb5/krb5.hin
@@ -1184,6 +1184,19 @@ typedef struct _krb5_pa_data {
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? */