summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sshd.c b/sshd.c
index d9d3780fb..d35403f20 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: sshd.c,v 1.183 2001/03/28 21:59:41 provos Exp $"); 43RCSID("$OpenBSD: sshd.c,v 1.184 2001/03/29 21:06:21 stevesk Exp $");
44 44
45#include <openssl/dh.h> 45#include <openssl/dh.h>
46#include <openssl/bn.h> 46#include <openssl/bn.h>
@@ -1419,15 +1419,17 @@ do_ssh2_kex(void)
1419 myproposal[PROPOSAL_ENC_ALGS_CTOS] = 1419 myproposal[PROPOSAL_ENC_ALGS_CTOS] =
1420 myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; 1420 myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
1421 } 1421 }
1422 myproposal[PROPOSAL_ENC_ALGS_CTOS] =
1423 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
1424 myproposal[PROPOSAL_ENC_ALGS_STOC] =
1425 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
1426
1422 if (options.macs != NULL) { 1427 if (options.macs != NULL) {
1423 myproposal[PROPOSAL_MAC_ALGS_CTOS] = 1428 myproposal[PROPOSAL_MAC_ALGS_CTOS] =
1424 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; 1429 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
1425 } 1430 }
1426 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); 1431 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types();
1427 1432
1428 myproposal[PROPOSAL_ENC_ALGS_STOC] =
1429 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
1430
1431 server_kexinit = kex_init(myproposal); 1433 server_kexinit = kex_init(myproposal);
1432 client_kexinit = xmalloc(sizeof(*client_kexinit)); 1434 client_kexinit = xmalloc(sizeof(*client_kexinit));
1433 buffer_init(client_kexinit); 1435 buffer_init(client_kexinit);