===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/rijndael.h,v
retrieving revision 1.1.2.6
retrieving revision 1.2
diff -u -r1.1.2.6 -r1.2
--- src/usr.bin/ssh/rijndael.h	2002/03/08 17:04:42	1.1.2.6
+++ src/usr.bin/ssh/rijndael.h	2000/12/06 23:05:43	1.2
@@ -1,51 +1,27 @@
-/*	$OpenBSD: rijndael.h,v 1.1.2.6 2002/03/08 17:04:42 brad Exp $ */
-
-/**
- * rijndael-alg-fst.h
+/*
+ * rijndael-alg-fst.h   v2.4   April '2000
+ * rijndael-api-fst.h   v2.4   April '2000
  *
- * @version 3.0 (December 2000)
+ * Optimised ANSI C code
  *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef __RIJNDAEL_H
-#define __RIJNDAEL_H
 
-#define MAXKC	(256/32)
-#define MAXKB	(256/8)
-#define MAXNR	14
+#ifndef RIJNDAEL_H
+#define RIJNDAEL_H
 
-typedef unsigned char	u8;
-typedef unsigned short	u16;
-typedef unsigned int	u32;
+#define RIJNDAEL_MAXKC		(256/32)
+#define RIJNDAEL_MAXROUNDS	14
 
-/*  The structure for key information */
+#define	RIJNDAEL_ENCRYPT	0
+#define	RIJNDAEL_DECRYPT	1
+
 typedef struct {
-	int	decrypt;
-	int	Nr;			/* key-length-dependent number of rounds */
-	u32	ek[4*(MAXNR + 1)];	/* encrypt key schedule */
-	u32	dk[4*(MAXNR + 1)];	/* decrypt key schedule */
-} rijndael_ctx;
+	int ROUNDS;		/* key-length-dependent number of rounds */
+	u_int8_t keySched[RIJNDAEL_MAXROUNDS+1][4][4];
+} rijndael_key;
 
-void	 rijndael_set_key(rijndael_ctx *, u_char *, int, int);
-void	 rijndael_decrypt(rijndael_ctx *, u_char *, u_char *);
-void	 rijndael_encrypt(rijndael_ctx *, u_char *, u_char *);
+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);
 
-#endif /* __RIJNDAEL_H */
+#endif