From: Chaskiel M Grundman <cg2v@andrew.cmu.edu>
Date: Mon, 9 Jul 2007 20:14:09 +0000 (+0000)
Subject: sparc-linux-des-alignment-20070709
X-Git-Tag: BP-openafs-windows-kdfs-ifs~613
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d8457dd359fccfc461b220061d23cf7600a95a4c;p=packages%2Fo%2Fopenafs.git

sparc-linux-des-alignment-20070709


seems like compilers really hate des. it should would be nice to euthanize this.

it's a shame there's no simple license-friendly des library to use
---

diff --git a/src/des/des.h b/src/des/des.h
index e75e90af1..9ad21d4a2 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 {
+    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 12a22a8b6..19bcb8721 100644
--- 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