STABLE14-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

(cherry picked from commit d8457dd359fccfc461b220061d23cf7600a95a4c)

diff --git a/src/des/des.h b/src/des/des.h
index e75e90af1193fe01f19a8c790cbb97d193f16ca3..9ad21d4a2f8cb2a41baace3a574b5c802d7c9fae 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 {
+    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 12a22a8b66232e8da3369fa35260d9aba0701da8..19bcb87217e580b0adedad96f4152da48cdb77ef 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