summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 69249c384..460d614f0 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.59 2001/03/29 14:24:59 provos Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.60 2001/03/29 21:06:21 stevesk Exp $");
27 27
28#include <openssl/bn.h> 28#include <openssl/bn.h>
29#include <openssl/md5.h> 29#include <openssl/md5.h>
@@ -85,6 +85,10 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
85 myproposal[PROPOSAL_ENC_ALGS_CTOS] = 85 myproposal[PROPOSAL_ENC_ALGS_CTOS] =
86 myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; 86 myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;
87 } 87 }
88 myproposal[PROPOSAL_ENC_ALGS_CTOS] =
89 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);
90 myproposal[PROPOSAL_ENC_ALGS_STOC] =
91 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
88 if (options.compression) { 92 if (options.compression) {
89 myproposal[PROPOSAL_COMP_ALGS_CTOS] = 93 myproposal[PROPOSAL_COMP_ALGS_CTOS] =
90 myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib"; 94 myproposal[PROPOSAL_COMP_ALGS_STOC] = "zlib";
@@ -97,9 +101,6 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
97 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs; 101 myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
98 } 102 }
99 103
100 myproposal[PROPOSAL_ENC_ALGS_STOC] =
101 compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_STOC]);
102
103 /* buffers with raw kexinit messages */ 104 /* buffers with raw kexinit messages */
104 server_kexinit = xmalloc(sizeof(*server_kexinit)); 105 server_kexinit = xmalloc(sizeof(*server_kexinit));
105 buffer_init(server_kexinit); 106 buffer_init(server_kexinit);