cast128: Reorganized context struct. Rewrite of key schedule.

1 files changed, 4 insertions, 2 deletions

diff --git a/cast128.h b/cast128.h
index 63636d21..abdf71df 100644
--- a/cast128.h
+++ b/cast128.h
@@ -53,8 +53,10 @@ extern "C" {
 
 struct cast128_ctx
 {
-  uint32_t keys[32];  /* Key, after expansion */
-  unsigned rounds;    /* Number of rounds to use, 12 or 16 */
+  unsigned rounds;  /* Number of rounds to use, 12 or 16 */
+  /* Expanded key, rotations (5 bits only) and 32-bit masks. */
+  unsigned char Kr[16];
+  uint32_t Km[16];
 };
 
 void