diff options
| author | des <des@FreeBSD.org> | 2006-09-30 13:29:51 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-09-30 13:29:51 +0000 |
| commit | 2f35ce4773442329d7798ccfecd8db9dcdce89bf (patch) | |
| tree | bba6f2fe7855d7b0095f9dc7720dc27bea4d1fdf /crypto/openssh/kex.h | |
| parent | 03ef9d989bf2619956d8c703362439e9be9257ca (diff) | |
| download | FreeBSD-src-2f35ce4773442329d7798ccfecd8db9dcdce89bf.zip FreeBSD-src-2f35ce4773442329d7798ccfecd8db9dcdce89bf.tar.gz | |
Vendor import of OpenSSH 4.4p1.
Diffstat (limited to 'crypto/openssh/kex.h')
| -rw-r--r-- | crypto/openssh/kex.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/openssh/kex.h b/crypto/openssh/kex.h index bbd931e..b1b20f5 100644 --- a/crypto/openssh/kex.h +++ b/crypto/openssh/kex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.38 2005/11/04 05:15:59 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.44 2006/08/03 03:34:42 deraadt Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -26,14 +26,13 @@ #ifndef KEX_H #define KEX_H +#include <signal.h> #include <openssl/evp.h> -#include "buffer.h" -#include "cipher.h" -#include "key.h" #define KEX_DH1 "diffie-hellman-group1-sha1" #define KEX_DH14 "diffie-hellman-group14-sha1" #define KEX_DHGEX_SHA1 "diffie-hellman-group-exchange-sha1" +#define KEX_DHGEX_SHA256 "diffie-hellman-group-exchange-sha256" #define COMP_NONE 0 #define COMP_ZLIB 1 @@ -63,6 +62,7 @@ enum kex_exchange { KEX_DH_GRP1_SHA1, KEX_DH_GRP14_SHA1, KEX_DH_GEX_SHA1, + KEX_DH_GEX_SHA256, KEX_MAX }; @@ -112,7 +112,7 @@ struct Kex { int kex_type; Buffer my; Buffer peer; - int done; + sig_atomic_t done; int flags; const EVP_MD *evp_md; char *client_version_string; @@ -142,7 +142,7 @@ kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); void kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *, - int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, + int, u_char *, int, int, int, int, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); void |
