summaryrefslogtreecommitdiff
path: root/kex.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-09-24 22:11:14 +1000
committerDamien Miller <djm@mindrot.org>2010-09-24 22:11:14 +1000
commitd5f62bf280b0798d7009d4424594a648a4e887fb (patch)
tree5f18078ea61f6c5503dc4addfb2f17d13844692c /kex.h
parent603134e077e667b4819effb0e121803842df621f (diff)
- djm@cvs.openbsd.org 2010/09/22 05:01:30
[kex.c kex.h kexecdh.c kexecdhc.c kexecdhs.c readconf.c readconf.h] [servconf.c servconf.h ssh_config.5 sshconnect2.c sshd.c sshd_config.5] add a KexAlgorithms knob to the client and server configuration to allow selection of which key exchange methods are used by ssh(1) and sshd(8) and their order of preference. ok markus@
Diffstat (limited to 'kex.h')
-rw-r--r--kex.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/kex.h b/kex.h
index 3e312fb44..7373d3c78 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.51 2010/09/09 10:45:45 djm Exp $ */ 1/* $OpenBSD: kex.h,v 1.52 2010/09/22 05:01:29 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -138,6 +138,8 @@ struct Kex {
138 void (*kex[KEX_MAX])(Kex *); 138 void (*kex[KEX_MAX])(Kex *);
139}; 139};
140 140
141int kex_names_valid(const char *);
142
141Kex *kex_setup(char *[PROPOSAL_MAX]); 143Kex *kex_setup(char *[PROPOSAL_MAX]);
142void kex_finish(Kex *); 144void kex_finish(Kex *);
143 145
@@ -169,7 +171,8 @@ kex_ecdh_hash(const EVP_MD *, const EC_GROUP *, char *, char *, char *, int,
169int kex_ecdh_name_to_nid(const char *); 171int kex_ecdh_name_to_nid(const char *);
170const EVP_MD *kex_ecdh_name_to_evpmd(const char *); 172const EVP_MD *kex_ecdh_name_to_evpmd(const char *);
171#else 173#else
172# define kex_ecdh_name_to_evpmd(x) NULL 174# define kex_ecdh_name_to_nid(x) (-1)
175# define kex_ecdh_name_to_evpmd(x) (NULL)
173#endif 176#endif
174 177
175void 178void