* Add a union to des_ks_struct and reorder includes to get the correct

  alignment for DES code on SPARC.  Thanks, Chaskiel Grundman.  Partly
  addresses #415952.

diff --git a/debian/changelog b/debian/changelog
index d0257263a57477a119aec6c85d165213d7878f35..3b87c8170d4997a48e83d95230678cbdced46ec4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 openafs (1.4.4.dfsg1-5) UNRELEASED; urgency=low
 
+  * Add a union to des_ks_struct and reorder includes to get the correct
+    alignment for DES code on SPARC.  Thanks, Chaskiel Grundman.  Partly
+    addresses #415952.
   * Fix a typo in debian/kern-sysname that caused openafs-modules-source
     to still assume all ia64 systems used Linux 2.4.  Thanks, Jakob
     Haufe.  (Closes: #432344)
@@ -11,7 +14,7 @@ openafs (1.4.4.dfsg1-5) UNRELEASED; urgency=low
     KeyFile and CellServDB.old from /etc/openafs/server, and remove
     BosConfig from /etc/openafs.
 
- -- Russ Allbery <rra@debian.org>  Mon, 09 Jul 2007 08:28:01 -0700
+ -- Russ Allbery <rra@debian.org>  Mon, 16 Jul 2007 11:48:32 -0700
 
 openafs (1.4.4.dfsg1-4) unstable; urgency=low
 

diff --git a/src/des/des.h b/src/des/des.h
index e75e90af1193fe01f19a8c790cbb97d193f16ca3..91c8ba534122630281cbbfe0f5fbffa19dff36c3 100644 (file)
--- a/src/des/des.h
+++ b/src/des/des.h
@@ -20,7 +20,10 @@
 typedef unsigned char des_cblock[8];   /* crypto-block size */
 /* Key schedule */
 typedef struct des_ks_struct {
-    des_cblock _;
+    union {
+        afs_uint32 i[2];
+        des_cblock _;
+    } _;
 } des_key_schedule[16];
 
 #define DES_KEY_SZ     (sizeof(des_cblock))

diff --git a/src/des/pcbc_encrypt.c b/src/des/pcbc_encrypt.c
index cb28d1fd03439d533ad5542b8c2e9171e440700a..6270cd160b0410a7a035c87fe3581d53a67ed0cf 100644 (file)
--- a/src/des/pcbc_encrypt.c
+++ b/src/des/pcbc_encrypt.c
@@ -24,9 +24,9 @@
 #ifndef KERNEL
 #include <stdio.h>
 #endif
-#include <des.h>
 #include <afsconfig.h>
 #include <afs/param.h>
+#include <des.h>
 #include "des_prototypes.h"
 
 RCSID