diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-17 18:11:36 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-17 18:11:36 +0000 |
commit | 982dbbcfda7ab9e56c4caccfba6f8920529421b7 (patch) | |
tree | 1c7d3ed45ad2f89c2e0009a188b76e6171d593a2 /sshconnect2.c | |
parent | 4c8cff14ddac08f1bdb393d71d9e0907d9a9215e (diff) |
- markus@cvs.openbsd.org 2001/04/17 10:53:26
[key.c key.h readconf.c readconf.h ssh.1 sshconnect2.c]
add HostKeyAlgorithms; based on patch from res@shore.net; ok provos@
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index 4acdd0171..baa4e7028 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.69 2001/04/15 08:43:47 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.70 2001/04/17 10:53:26 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/md5.h> | 29 | #include <openssl/md5.h> |
@@ -111,6 +111,9 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) | |||
111 | myproposal[PROPOSAL_MAC_ALGS_CTOS] = | 111 | myproposal[PROPOSAL_MAC_ALGS_CTOS] = |
112 | myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; | 112 | myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; |
113 | } | 113 | } |
114 | if (options.hostkeyalgorithms != NULL) | ||
115 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = | ||
116 | options.hostkeyalgorithms; | ||
114 | 117 | ||
115 | /* start key exchange */ | 118 | /* start key exchange */ |
116 | kex = kex_setup(myproposal); | 119 | kex = kex_setup(myproposal); |