summaryrefslogtreecommitdiff
path: root/cipher.h
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2000-12-10 01:55:37 +0000
committerBen Lindstrom <mouring@eviladmin.org>2000-12-10 01:55:37 +0000
commitfa1b3d08421d263694d5fb3989d796a57d714f2a (patch)
treed3e8b0669d169e2c6c3ca8e3c30ddc5538ec6490 /cipher.h
parenta688561ef4bf78651e60b112960b099c2bee1d90 (diff)
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
Diffstat (limited to 'cipher.h')
-rw-r--r--cipher.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/cipher.h b/cipher.h
index 0223ace3..752d0347 100644
--- a/cipher.h
+++ b/cipher.h
@@ -32,7 +32,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* RCSID("$OpenBSD: cipher.h,v 1.23 2000/12/06 23:05:42 markus Exp $"); */
+/* RCSID("$OpenBSD: cipher.h,v 1.24 2000/12/09 13:41:52 markus Exp $"); */
#ifndef CIPHER_H
#define CIPHER_H
@@ -41,9 +41,7 @@
#include <openssl/blowfish.h>
#include <openssl/rc4.h>
#include <openssl/cast.h>
-
#include "rijndael.h"
-
/*
* Cipher types for SSH-1. New types can be added, but old types should not
* be removed for compatibility. The maximum allowed value is 31.
@@ -86,9 +84,9 @@ struct CipherContext {
u_char iv[8];
} cast;
struct {
- u_char iv[16];
- rijndael_key enc;
- rijndael_key dec;
+ u4byte iv[4];
+ rijndael_ctx enc;
+ rijndael_ctx dec;
} rijndael;
RC4_KEY rc4;
} u;