diff options
Diffstat (limited to 'kex.h')
| -rw-r--r-- | kex.h | 22 |
1 files changed, 5 insertions, 17 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.64 2014/05/02 03:27:54 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.65 2015/01/13 19:31:40 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -26,10 +26,9 @@ #ifndef KEX_H #define KEX_H -#include <signal.h> -#include <openssl/evp.h> -#include <openssl/hmac.h> -#ifdef OPENSSL_HAS_ECC +#include "mac.h" + +#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC) #include <openssl/ec.h> #endif @@ -82,8 +81,8 @@ enum kex_exchange { #define KEX_INIT_SENT 0x0001 typedef struct Kex Kex; -typedef struct Mac Mac; typedef struct Comp Comp; +typedef struct sshmac Mac; typedef struct Enc Enc; typedef struct Newkeys Newkeys; @@ -97,17 +96,6 @@ struct Enc { u_char *key; u_char *iv; }; -struct Mac { - char *name; - int enabled; - u_int mac_len; - u_char *key; - u_int key_len; - int type; - int etm; /* Encrypt-then-MAC */ - struct ssh_hmac_ctx *hmac_ctx; - struct umac_ctx *umac_ctx; -}; struct Comp { int type; int enabled; |