summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-05-10 23:26:11 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-05-10 23:26:11 +0000
commitddb4f24056225322bc97eb366cbe5b2927fd7c89 (patch)
tree53fbad411ae7670ec52f843de00a9d2f8e09f7cb
parent6d618466e8c20eba056db44acc22fc9f7048f961 (diff)
- markus@cvs.openbsd.org 2001/05/09 23:01:31
[rijndael.h] fix prototype; J.S.Peatfield@damtp.cam.ac.uk
-rw-r--r--ChangeLog5
-rw-r--r--rijndael.h5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 26092a84..7fe38932 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
[channels.c]
fix -R for protocol 2, noticed by greg@nest.cx.
bug was introduced with experimental dynamic forwarding.
+ - markus@cvs.openbsd.org 2001/05/09 23:01:31
+ [rijndael.h]
+ fix prototype; J.S.Peatfield@damtp.cam.ac.uk
20010509
- OpenBSD CVS Sync
@@ -5391,4 +5394,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1215 2001/05/10 23:24:49 mouring Exp $
+$Id: ChangeLog,v 1.1216 2001/05/10 23:26:11 mouring Exp $
diff --git a/rijndael.h b/rijndael.h
index fa350483..1656448c 100644
--- a/rijndael.h
+++ b/rijndael.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rijndael.h,v 1.7 2001/03/01 03:38:33 deraadt Exp $ */
+/* $OpenBSD: rijndael.h,v 1.8 2001/05/09 23:01:31 markus Exp $ */
/* This is an independent implementation of the encryption algorithm: */
/* */
@@ -42,7 +42,8 @@ typedef struct _rijndael_ctx {
/* 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));
+rijndael_ctx *
+rijndael_set_key __P((rijndael_ctx *, const u4byte *, const u4byte, int));
void rijndael_encrypt __P((rijndael_ctx *, const u4byte *, u4byte *));
void rijndael_decrypt __P((rijndael_ctx *, const u4byte *, u4byte *));