20001210

 - (bal) OpenBSD CVS updates
   - markus@cvs.openbsd.org 2000/12/09 13:41:51
     [cipher.c cipher.h rijndael.c rijndael.h rijndael_boxes.h]
     undo rijndael changes
   - markus@cvs.openbsd.org 2000/12/09 13:48:31
     [rijndael.c]
     fix byte order bug w/o introducing new implementation
   - markus@cvs.openbsd.org 2000/12/09 14:08:27
     [sftp-server.c]
     "" -> "." for realpath; from vinschen@redhat.com
   - markus@cvs.openbsd.org 2000/12/09 14:06:54
     [ssh-agent.c]
     extern int optind; from stevesk@sweden.hp.com

1 files changed, 27 insertions, 21 deletions

diff --git a/rijndael.h b/rijndael.h
index 75853cfff..09c425742 100644
--- a/rijndael.h
+++ b/rijndael.h
@@ -1,27 +1,33 @@
-/*
- * rijndael-alg-fst.h   v2.4   April '2000
- * rijndael-api-fst.h   v2.4   April '2000
- *
- * Optimised ANSI C code
- *
- */
+#ifndef _RIJNDAEL_H_
+#define _RIJNDAEL_H_
 
-#ifndef RIJNDAEL_H
-#define RIJNDAEL_H
+#include "config.h"
 
-#define RIJNDAEL_MAXKC          (256/32)
-#define RIJNDAEL_MAXROUNDS      14
+/* 1. Standard types for AES cryptography source code               */
 
-#define RIJNDAEL_ENCRYPT        0
-#define RIJNDAEL_DECRYPT        1
+typedef u_int8_t   u1byte; /* an 8 bit unsigned character type */
+typedef u_int16_t  u2byte; /* a 16 bit unsigned integer type   */
+typedef u_int32_t  u4byte; /* a 32 bit unsigned integer type   */
 
-typedef struct {
-        int ROUNDS;             /* key-length-dependent number of rounds */
-        u_int8_t keySched[RIJNDAEL_MAXROUNDS+1][4][4];
-} rijndael_key;
+typedef int8_t     s1byte; /* an 8 bit signed character type   */
+typedef int16_t    s2byte; /* a 16 bit signed integer type     */
+typedef int32_t    s4byte; /* a 32 bit signed integer type     */
 
-int rijndael_encrypt(rijndael_key *key, u_int8_t a[16], u_int8_t b[16]);
-int rijndael_decrypt(rijndael_key *key, u_int8_t a[16], u_int8_t b[16]);
-int rijndael_makekey(rijndael_key *key, int direction, int keyLen, u_int8_t *keyMaterial);
+typedef struct _rijndael_ctx {
+        u4byte  k_len;
+        int decrypt;
+        u4byte  e_key[64];
+        u4byte  d_key[64];
+} rijndael_ctx;
 
-#endif
+
+/* 2. Standard interface for AES cryptographic routines             */
+
+/* These are all based on 32 bit unsigned values and will therefore */
+/* require endian conversions for big-endian architectures          */
+
+rijndael_ctx *rijndael_set_key  __P((rijndael_ctx *, const u4byte *, u4byte, int));
+void rijndael_encrypt __P((rijndael_ctx *, const u4byte *, u4byte *));
+void rijndael_decrypt __P((rijndael_ctx *, const u4byte *, u4byte *));
+
+#endif /* _RIJNDAEL_H_ */