aboutsummaryrefslogtreecommitdiff
path: root/crypto/openssh/kex.h
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/openssh/kex.h')
-rw-r--r--crypto/openssh/kex.h28
1 files changed, 15 insertions, 13 deletions
diff --git a/crypto/openssh/kex.h b/crypto/openssh/kex.h
index 8758804c5544..755bf332aa40 100644
--- a/crypto/openssh/kex.h
+++ b/crypto/openssh/kex.h
@@ -1,7 +1,7 @@
-/* $OpenBSD: kex.h,v 1.22 2001/04/04 20:25:37 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.29 2002/02/14 23:41:01 markus Exp $ */
/*
- * Copyright (c) 2000 Markus Friedl. All rights reserved.
+ * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -71,6 +71,8 @@ struct Enc {
char *name;
Cipher *cipher;
int enabled;
+ u_int key_len;
+ u_int block_size;
u_char *key;
u_char *iv;
};
@@ -107,24 +109,24 @@ struct Kex {
int flags;
char *client_version_string;
char *server_version_string;
- int (*check_host_key)(Key *hostkey);
- Key *(*load_host_key)(int type);
+ int (*verify_host_key)(Key *);
+ Key *(*load_host_key)(int);
};
-Kex *kex_setup(char *proposal[PROPOSAL_MAX]);
-void kex_finish(Kex *kex);
+Kex *kex_setup(char *[PROPOSAL_MAX]);
+void kex_finish(Kex *);
-void kex_send_kexinit(Kex *kex);
-void kex_input_kexinit(int type, int plen, void *ctxt);
-void kex_derive_keys(Kex *k, u_char *hash, BIGNUM *shared_secret);
+void kex_send_kexinit(Kex *);
+void kex_input_kexinit(int, u_int32_t, void *);
+void kex_derive_keys(Kex *, u_char *, BIGNUM *);
-void kexdh(Kex *);
-void kexgex(Kex *);
+void kexdh(Kex *);
+void kexgex(Kex *);
-Newkeys *kex_get_newkeys(int mode);
+Newkeys *kex_get_newkeys(int);
#if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
-void dump_digest(char *msg, u_char *digest, int len);
+void dump_digest(char *, u_char *, int);
#endif
#endif