- (djm) Redhat initscript config sanity checking from Pekka Savola

[openssh.git] / cipher.h

diff --git a/cipher.h b/cipher.h
index 16dd06230f6fe692127615ff4e7d6ca799b1d16a..4533f5e4c20fd40c6b58ade84f33b089cba0a0a1 100644 (file)
--- 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.27 2001/06/26 06:32:49 itojun Exp $"); */
+/* RCSID("$OpenBSD: cipher.h,v 1.29 2001/08/23 11:31:59 markus Exp $"); */
 
 #ifndef CIPHER_H
 #define CIPHER_H
@@ -85,7 +85,7 @@ struct CipherContext {
                        u_char iv[8];
                } cast;
                struct {
-                       u4byte iv[4];
+                       u_char iv[16];
                        rijndael_ctx enc;
                        rijndael_ctx dec;
                } rijndael;
@@ -104,16 +104,16 @@ struct Cipher {
        void    (*decrypt)(CipherContext *, u_char *, const u_char *, u_int);
 };
 
-u_int cipher_mask_ssh1(int);
-Cipher *cipher_by_name(const char *);
-Cipher *cipher_by_number(int);
-int cipher_number(const char *);
-char *cipher_name(int);
-int ciphers_valid(const char *);
-void cipher_init(CipherContext *, Cipher *, const u_char *, u_int,
+u_int   cipher_mask_ssh1(int);
+Cipher *cipher_by_name(const char *);
+Cipher *cipher_by_number(int);
+int     cipher_number(const char *);
+char   *cipher_name(int);
+int     ciphers_valid(const char *);
+void    cipher_init(CipherContext *, Cipher *, const u_char *, u_int,
     const u_char *, u_int);
-void cipher_encrypt(CipherContext *, u_char *, const u_char *, u_int);
-void cipher_decrypt(CipherContext *, u_char *, const u_char *, u_int);
-void cipher_set_key_string(CipherContext *, Cipher *, const char *);
+void    cipher_encrypt(CipherContext *, u_char *, const u_char *, u_int);
+void    cipher_decrypt(CipherContext *, u_char *, const u_char *, u_int);
+void    cipher_set_key_string(CipherContext *, Cipher *, const char *);
 
 #endif                         /* CIPHER_H */