From 39dc5e7166e4c58231ef220cf8fe0b3c55b7528d Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 16 Jul 2007 18:46:08 +0000 Subject: [PATCH] * 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. --- debian/changelog | 5 ++++- src/des/des.h | 5 ++++- src/des/pcbc_encrypt.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0257263a..3b87c8170 100644 --- 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 Mon, 09 Jul 2007 08:28:01 -0700 + -- Russ Allbery 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 e75e90af1..91c8ba534 100644 --- 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 cb28d1fd0..6270cd160 100644 --- a/src/des/pcbc_encrypt.c +++ b/src/des/pcbc_encrypt.c @@ -24,9 +24,9 @@ #ifndef KERNEL #include #endif -#include #include #include +#include #include "des_prototypes.h" RCSID -- 2.39.5