merge 6.2p1; reorder additions to monitor.h for easier merging in future

1 files changed, 6 insertions, 2 deletions

diff --git a/cipher.h b/cipher.h
index 3dd2270bb..8cb57c3e5 100644
--- a/cipher.h
+++ b/cipher.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.h,v 1.37 2009/01/26 09:58:15 markus Exp $ */
+/* $OpenBSD: cipher.h,v 1.39 2013/01/08 18:49:04 markus Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -64,6 +64,7 @@ typedef struct CipherContext CipherContext;
 struct Cipher;
 struct CipherContext {
         int     plaintext;
+        int     encrypt;
         EVP_CIPHER_CTX evp;
         Cipher *cipher;
 };
@@ -76,11 +77,14 @@ char	*cipher_name(int);
 int      ciphers_valid(const char *);
 void     cipher_init(CipherContext *, Cipher *, const u_char *, u_int,
     const u_char *, u_int, int);
-void     cipher_crypt(CipherContext *, u_char *, const u_char *, u_int);
+void     cipher_crypt(CipherContext *, u_char *, const u_char *,
+    u_int, u_int, u_int);
 void     cipher_cleanup(CipherContext *);
 void     cipher_set_key_string(CipherContext *, Cipher *, const char *, int);
 u_int    cipher_blocksize(const Cipher *);
 u_int    cipher_keylen(const Cipher *);
+u_int    cipher_authlen(const Cipher *);
+u_int    cipher_ivlen(const Cipher *);
 u_int    cipher_is_cbc(const Cipher *);
 
 u_int    cipher_get_number(const Cipher *);