- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / cipher.h

diff --git a/cipher.h b/cipher.h
index b3b0303c7f6079522b585d5d257462cdb6d39f04..3dd2270bbe9e52f534a8dfc4cc6f092e53cd8451 100644 (file)
--- a/cipher.h
+++ b/cipher.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cipher.h,v 1.32 2002/03/04 17:27:39 stevesk Exp $     */
+/* $OpenBSD: cipher.h,v 1.37 2009/01/26 09:58:15 markus Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -43,7 +43,7 @@
  * 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 */
@@ -79,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 */