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

1 files changed, 3 insertions, 1 deletions

diff --git a/kex.h b/kex.h
index fa50b2ccb..8013ab8a4 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.52 2010/09/22 05:01:29 djm Exp $ */
+/* $OpenBSD: kex.h,v 1.54 2013/01/08 18:49:04 markus Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -92,6 +92,7 @@ struct Enc {
         Cipher  *cipher;
         int     enabled;
         u_int   key_len;
+        u_int   iv_len;
         u_int   block_size;
         u_char  *key;
         u_char  *iv;
@@ -103,6 +104,7 @@ struct Mac {
         u_char  *key;
         u_int   key_len;
         int     type;
+        int     etm;            /* Encrypt-then-MAC */
         const EVP_MD    *evp_md;
         HMAC_CTX        evp_ctx;
         struct umac_ctx *umac_ctx;