summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--rijndael.h5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 26092a844..7fe389325 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 [channels.c] 4 [channels.c]
5 fix -R for protocol 2, noticed by greg@nest.cx. 5 fix -R for protocol 2, noticed by greg@nest.cx.
6 bug was introduced with experimental dynamic forwarding. 6 bug was introduced with experimental dynamic forwarding.
7 - markus@cvs.openbsd.org 2001/05/09 23:01:31
8 [rijndael.h]
9 fix prototype; J.S.Peatfield@damtp.cam.ac.uk
7 10
820010509 1120010509
9 - OpenBSD CVS Sync 12 - OpenBSD CVS Sync
@@ -5391,4 +5394,4 @@
5391 - Wrote replacements for strlcpy and mkdtemp 5394 - Wrote replacements for strlcpy and mkdtemp
5392 - Released 1.0pre1 5395 - Released 1.0pre1
5393 5396
5394$Id: ChangeLog,v 1.1215 2001/05/10 23:24:49 mouring Exp $ 5397$Id: ChangeLog,v 1.1216 2001/05/10 23:26:11 mouring Exp $
diff --git a/rijndael.h b/rijndael.h
index fa350483e..1656448c9 100644
--- a/rijndael.h
+++ b/rijndael.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: rijndael.h,v 1.7 2001/03/01 03:38:33 deraadt Exp $ */ 1/* $OpenBSD: rijndael.h,v 1.8 2001/05/09 23:01:31 markus Exp $ */
2 2
3/* This is an independent implementation of the encryption algorithm: */ 3/* This is an independent implementation of the encryption algorithm: */
4/* */ 4/* */
@@ -42,7 +42,8 @@ typedef struct _rijndael_ctx {
42/* These are all based on 32 bit unsigned values and will therefore */ 42/* These are all based on 32 bit unsigned values and will therefore */
43/* require endian conversions for big-endian architectures */ 43/* require endian conversions for big-endian architectures */
44 44
45rijndael_ctx *rijndael_set_key __P((rijndael_ctx *, const u4byte *, u4byte, int)); 45rijndael_ctx *
46rijndael_set_key __P((rijndael_ctx *, const u4byte *, const u4byte, int));
46void rijndael_encrypt __P((rijndael_ctx *, const u4byte *, u4byte *)); 47void rijndael_encrypt __P((rijndael_ctx *, const u4byte *, u4byte *));
47void rijndael_decrypt __P((rijndael_ctx *, const u4byte *, u4byte *)); 48void rijndael_decrypt __P((rijndael_ctx *, const u4byte *, u4byte *));
48 49