This is a derived file. It should not be in CVS.

[gssapi-openssh.git] / openssh / cipher.h

diff --git a/openssh/cipher.h b/openssh/cipher.h
index fc7f6dd0fc46b3301938626c3a2b6d319313e28d..49bbc1682b9779c5a6d2dbe65a2c7188db8317de 100644 (file)
--- a/openssh/cipher.h
+++ b/openssh/cipher.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cipher.h,v 1.33 2002/03/18 17:13:15 markus Exp $      */
+/* $OpenBSD: cipher.h,v 1.36 2006/03/25 22:22:42 djm 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,13 +79,13 @@ 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_get_number(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(CipherContext *);
-int     cipher_get_keycontext(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 */