- guenther@cvs.openbsd.org 2009/12/20 07:28:36

[openssh.git] / cipher.h

diff --git a/cipher.h b/cipher.h
index 0c412b47f956733520f2176f3a71861c0a3ff57f..3dd2270bbe9e52f534a8dfc4cc6f092e53cd8451 100644 (file)
--- a/cipher.h
+++ b/cipher.h
@@ -1,3 +1,5 @@
+/* $OpenBSD: cipher.h,v 1.37 2009/01/26 09:58:15 markus Exp $ */
+
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -32,22 +34,16 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/* RCSID("$OpenBSD: cipher.h,v 1.30 2002/02/14 23:41:01 markus Exp $"); */
-
 #ifndef CIPHER_H
 #define CIPHER_H
 
-#include <openssl/des.h>
-#include <openssl/blowfish.h>
-#include <openssl/rc4.h>
-#include <openssl/cast.h>
-#include "rijndael.h"
+#include <openssl/evp.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.
  */
 #define SSH_CIPHER_SSH2                -3
-#define SSH_CIPHER_ILLEGAL     -2      /* No valid cipher selected. */
+#define SSH_CIPHER_INVALID     -2      /* No valid cipher selected. */
 #define SSH_CIPHER_NOT_SET     -1      /* None selected (invalid number). */
 #define SSH_CIPHER_NONE                0       /* no encryption */
 #define SSH_CIPHER_IDEA                1       /* IDEA CFB */
@@ -67,36 +63,8 @@ typedef struct CipherContext CipherContext;
 
 struct Cipher;
 struct CipherContext {
-       union {
-               struct {
-                       des_key_schedule key;
-                       des_cblock iv;
-               }       des;
-               struct {
-                       des_key_schedule key1;
-                       des_key_schedule key2;
-                       des_key_schedule key3;
-                       des_cblock iv1;
-                       des_cblock iv2;
-                       des_cblock iv3;
-               }       des3;
-               struct {
-                       struct bf_key_st key;
-                       u_char iv[8];
-               }       bf;
-               struct {
-                       CAST_KEY key;
-                       u_char iv[8];
-               } cast;
-               struct {
-                       u_char iv[16];
-                       rijndael_ctx enc;
-                       rijndael_ctx dec;
-               } rijndael;
-               RC4_KEY rc4;
-       }       u;
        int     plaintext;
-       int     encrypt;
+       EVP_CIPHER_CTX evp;
        Cipher *cipher;
 };
 
@@ -111,6 +79,14 @@ void         cipher_init(CipherContext *, Cipher *, const u_char *, u_int,
 void    cipher_crypt(CipherContext *, u_char *, const u_char *, u_int);
 void    cipher_cleanup(CipherContext *);
 void    cipher_set_key_string(CipherContext *, Cipher *, const char *, int);
-u_int   cipher_blocksize(Cipher *);
-u_int   cipher_keylen(Cipher *);
+u_int   cipher_blocksize(const Cipher *);
+u_int   cipher_keylen(const Cipher *);
+u_int   cipher_is_cbc(const Cipher *);
+
+u_int   cipher_get_number(const Cipher *);
+void    cipher_get_keyiv(CipherContext *, u_char *, u_int);
+void    cipher_set_keyiv(CipherContext *, u_char *);
+int     cipher_get_keyiv_len(const CipherContext *);
+int     cipher_get_keycontext(const CipherContext *, u_char *);
+void    cipher_set_keycontext(CipherContext *, u_char *);
 #endif                         /* CIPHER_H */